diff options
author | Oleksander Piskun <oleksandr2088@icloud.com> | 2025-04-08 20:45:37 +0300 |
---|---|---|
committer | Oleksander Piskun <oleksandr2088@icloud.com> | 2025-04-09 15:47:48 +0300 |
commit | c23ab0d1f7ca6985f873035c8801d0c3244cc2d2 (patch) | |
tree | 220fc1fb01009c0dabb4624b92956edfe72e8b17 /lib/private | |
parent | 90a3928cdb2f390f2018e819b26c62255322be4d (diff) | |
download | nextcloud-server-fix/noid/taskprocessing-appapi.tar.gz nextcloud-server-fix/noid/taskprocessing-appapi.zip |
fix(taskprocessing): use the event for AppAPI to get list of AI providersfix/noid/taskprocessing-appapi
Signed-off-by: Oleksander Piskun <oleksandr2088@icloud.com>
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/TaskProcessing/Manager.php | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/lib/private/TaskProcessing/Manager.php b/lib/private/TaskProcessing/Manager.php index 0582d801e3d..a701c23d56f 100644 --- a/lib/private/TaskProcessing/Manager.php +++ b/lib/private/TaskProcessing/Manager.php @@ -41,6 +41,7 @@ use OCP\Lock\LockedException; use OCP\SpeechToText\ISpeechToTextProvider; use OCP\SpeechToText\ISpeechToTextProviderWithId; use OCP\TaskProcessing\EShapeType; +use OCP\TaskProcessing\Events\GetTaskProcessingProvidersEvent; use OCP\TaskProcessing\Events\TaskFailedEvent; use OCP\TaskProcessing\Events\TaskSuccessfulEvent; use OCP\TaskProcessing\Exception\NotFoundException; @@ -81,8 +82,13 @@ class Manager implements IManager { private IAppData $appData; private ?array $preferences = null; private ?array $providersById = null; + + /** @var ITaskType[]|null */ + private ?array $taskTypes = null; private ICache $distributedCache; + private ?GetTaskProcessingProvidersEvent $eventResult = null; + public function __construct( private IConfig $config, private Coordinator $coordinator, @@ -489,6 +495,20 @@ class Manager implements IManager { } /** + * Dispatches the event to collect external providers and task types. + * Caches the result within the request. + */ + private function dispatchGetProvidersEvent(): GetTaskProcessingProvidersEvent { + if ($this->eventResult !== null) { + return $this->eventResult; + } + + $this->eventResult = new GetTaskProcessingProvidersEvent(); + $this->dispatcher->dispatchTyped($this->eventResult); + return $this->eventResult ; + } + + /** * @return IProvider[] */ private function _getProviders(): array { @@ -516,6 +536,16 @@ class Manager implements IManager { } } + $event = $this->dispatchGetProvidersEvent(); + $externalProviders = $event->getProviders(); + foreach ($externalProviders as $provider) { + if (!isset($providers[$provider->getId()])) { + $providers[$provider->getId()] = $provider; + } else { + $this->logger->info('Skipping external task processing provider with ID ' . $provider->getId() . ' because a local provider with the same ID already exists.'); + } + } + $providers += $this->_getTextProcessingProviders() + $this->_getTextToImageProviders() + $this->_getSpeechToTextProviders(); return $providers; @@ -531,6 +561,10 @@ class Manager implements IManager { return []; } + if ($this->taskTypes !== null) { + return $this->taskTypes; + } + // Default task types $taskTypes = [ \OCP\TaskProcessing\TaskTypes\TextToText::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\TextToText::class), @@ -568,9 +602,19 @@ class Manager implements IManager { } } + $event = $this->dispatchGetProvidersEvent(); + $externalTaskTypes = $event->getTaskTypes(); + foreach ($externalTaskTypes as $taskType) { + if (isset($taskTypes[$taskType->getId()])) { + $this->logger->warning('External task processing task type is using ID ' . $taskType->getId() . ' which is already used by a locally registered task type (' . get_class($taskTypes[$taskType->getId()]) . ')'); + } + $taskTypes[$taskType->getId()] = $taskType; + } + $taskTypes += $this->_getTextProcessingTaskTypes(); - return $taskTypes; + $this->taskTypes = $taskTypes; + return $this->taskTypes; } /** |