aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/TaskProcessing/TaskProcessingTest.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/TaskProcessing/TaskProcessingTest.php')
-rw-r--r--tests/lib/TaskProcessing/TaskProcessingTest.php714
1 files changed, 625 insertions, 89 deletions
diff --git a/tests/lib/TaskProcessing/TaskProcessingTest.php b/tests/lib/TaskProcessing/TaskProcessingTest.php
index fe679ebbd2d..fee4e9ba3ba 100644
--- a/tests/lib/TaskProcessing/TaskProcessingTest.php
+++ b/tests/lib/TaskProcessing/TaskProcessingTest.php
@@ -1,9 +1,10 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
-namespace Test\TextProcessing;
+namespace Test\TaskProcessing;
use OC\AppFramework\Bootstrap\Coordinator;
use OC\AppFramework\Bootstrap\RegistrationContext;
@@ -12,21 +13,32 @@ use OC\EventDispatcher\EventDispatcher;
use OC\TaskProcessing\Db\TaskMapper;
use OC\TaskProcessing\Manager;
use OC\TaskProcessing\RemoveOldTasksBackgroundJob;
+use OC\TaskProcessing\SynchronousBackgroundJob;
+use OCP\App\IAppManager;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\AppData\IAppDataFactory;
-use OCP\Files\IAppData;
+use OCP\Files\Config\ICachedMountInfo;
+use OCP\Files\Config\IUserMountCache;
+use OCP\Files\File;
use OCP\Files\IRootFolder;
+use OCP\Http\Client\IClientService;
+use OCP\IAppConfig;
+use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IServerContainer;
+use OCP\IUser;
use OCP\IUserManager;
-use OCP\SpeechToText\ISpeechToTextManager;
+use OCP\IUserSession;
+use OCP\Server;
use OCP\TaskProcessing\EShapeType;
+use OCP\TaskProcessing\Events\GetTaskProcessingProvidersEvent;
use OCP\TaskProcessing\Events\TaskFailedEvent;
use OCP\TaskProcessing\Events\TaskSuccessfulEvent;
use OCP\TaskProcessing\Exception\NotFoundException;
+use OCP\TaskProcessing\Exception\PreConditionNotMetException;
use OCP\TaskProcessing\Exception\ProcessingException;
use OCP\TaskProcessing\Exception\UnauthorizedException;
use OCP\TaskProcessing\Exception\ValidationException;
@@ -100,11 +112,37 @@ class AsyncProvider implements IProvider {
'optionalKey' => new ShapeDescriptor('optional Key', 'AN optional key', EShapeType::Text),
];
}
+
+ public function getInputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getInputShapeDefaults(): array {
+ return [];
+ }
+
+ public function getOptionalInputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getOptionalInputShapeDefaults(): array {
+ return [];
+ }
+
+ public function getOutputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getOptionalOutputShapeEnumValues(): array {
+ return [];
+ }
}
class SuccessfulSyncProvider implements IProvider, ISynchronousProvider {
+ public const ID = 'test:sync:success';
+
public function getId(): string {
- return 'test:sync:success';
+ return self::ID;
}
public function getName(): string {
@@ -134,8 +172,34 @@ class SuccessfulSyncProvider implements IProvider, ISynchronousProvider {
public function process(?string $userId, array $input, callable $reportProgress): array {
return ['output' => $input['input']];
}
+
+ public function getInputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getInputShapeDefaults(): array {
+ return [];
+ }
+
+ public function getOptionalInputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getOptionalInputShapeDefaults(): array {
+ return [];
+ }
+
+ public function getOutputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getOptionalOutputShapeEnumValues(): array {
+ return [];
+ }
}
+
+
class FailingSyncProvider implements IProvider, ISynchronousProvider {
public const ERROR_MESSAGE = 'Failure';
public function getId(): string {
@@ -169,6 +233,30 @@ class FailingSyncProvider implements IProvider, ISynchronousProvider {
public function process(?string $userId, array $input, callable $reportProgress): array {
throw new ProcessingException(self::ERROR_MESSAGE);
}
+
+ public function getInputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getInputShapeDefaults(): array {
+ return [];
+ }
+
+ public function getOptionalInputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getOptionalInputShapeDefaults(): array {
+ return [];
+ }
+
+ public function getOutputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getOptionalOutputShapeEnumValues(): array {
+ return [];
+ }
}
class BrokenSyncProvider implements IProvider, ISynchronousProvider {
@@ -203,6 +291,30 @@ class BrokenSyncProvider implements IProvider, ISynchronousProvider {
public function process(?string $userId, array $input, callable $reportProgress): array {
return [];
}
+
+ public function getInputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getInputShapeDefaults(): array {
+ return [];
+ }
+
+ public function getOptionalInputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getOptionalInputShapeDefaults(): array {
+ return [];
+ }
+
+ public function getOutputShapeEnumValues(): array {
+ return [];
+ }
+
+ public function getOptionalOutputShapeEnumValues(): array {
+ return [];
+ }
}
class SuccessfulTextProcessingSummaryProvider implements \OCP\TextProcessing\IProvider {
@@ -252,7 +364,7 @@ class SuccessfulTextToImageProvider implements \OCP\TextToImage\IProvider {
public function generate(string $prompt, array $resources): void {
$this->ran = true;
- foreach($resources as $resource) {
+ foreach ($resources as $resource) {
fwrite($resource, 'test');
}
}
@@ -283,6 +395,132 @@ class FailingTextToImageProvider implements \OCP\TextToImage\IProvider {
}
}
+class ExternalProvider implements IProvider {
+ public const ID = 'event:external:provider';
+ public const TASK_TYPE_ID = 'event:external:tasktype';
+
+ public function getId(): string {
+ return self::ID;
+ }
+ public function getName(): string {
+ return 'External Provider via Event';
+ }
+ public function getTaskTypeId(): string {
+ return self::TASK_TYPE_ID;
+ }
+ public function getExpectedRuntime(): int {
+ return 5;
+ }
+ public function getOptionalInputShape(): array {
+ return [];
+ }
+ public function getOptionalOutputShape(): array {
+ return [];
+ }
+ public function getInputShapeEnumValues(): array {
+ return [];
+ }
+ public function getInputShapeDefaults(): array {
+ return [];
+ }
+ public function getOptionalInputShapeEnumValues(): array {
+ return [];
+ }
+ public function getOptionalInputShapeDefaults(): array {
+ return [];
+ }
+ public function getOutputShapeEnumValues(): array {
+ return [];
+ }
+ public function getOptionalOutputShapeEnumValues(): array {
+ return [];
+ }
+}
+
+class ConflictingExternalProvider implements IProvider {
+ // Same ID as SuccessfulSyncProvider
+ public const ID = 'test:sync:success';
+ public const TASK_TYPE_ID = 'event:external:tasktype'; // Can be different task type
+
+ public function getId(): string {
+ return self::ID;
+ }
+ public function getName(): string {
+ return 'Conflicting External Provider';
+ }
+ public function getTaskTypeId(): string {
+ return self::TASK_TYPE_ID;
+ }
+ public function getExpectedRuntime(): int {
+ return 50;
+ }
+ public function getOptionalInputShape(): array {
+ return [];
+ }
+ public function getOptionalOutputShape(): array {
+ return [];
+ }
+ public function getInputShapeEnumValues(): array {
+ return [];
+ }
+ public function getInputShapeDefaults(): array {
+ return [];
+ }
+ public function getOptionalInputShapeEnumValues(): array {
+ return [];
+ }
+ public function getOptionalInputShapeDefaults(): array {
+ return [];
+ }
+ public function getOutputShapeEnumValues(): array {
+ return [];
+ }
+ public function getOptionalOutputShapeEnumValues(): array {
+ return [];
+ }
+}
+
+class ExternalTaskType implements ITaskType {
+ public const ID = 'event:external:tasktype';
+
+ public function getId(): string {
+ return self::ID;
+ }
+ public function getName(): string {
+ return 'External Task Type via Event';
+ }
+ public function getDescription(): string {
+ return 'A task type added via event';
+ }
+ public function getInputShape(): array {
+ return ['external_input' => new ShapeDescriptor('Ext In', '', EShapeType::Text)];
+ }
+ public function getOutputShape(): array {
+ return ['external_output' => new ShapeDescriptor('Ext Out', '', EShapeType::Text)];
+ }
+}
+
+class ConflictingExternalTaskType implements ITaskType {
+ // Same ID as built-in TextToText
+ public const ID = TextToText::ID;
+
+ public function getId(): string {
+ return self::ID;
+ }
+ public function getName(): string {
+ return 'Conflicting External Task Type';
+ }
+ public function getDescription(): string {
+ return 'Overrides built-in TextToText';
+ }
+ public function getInputShape(): array {
+ return ['override_input' => new ShapeDescriptor('Override In', '', EShapeType::Number)];
+ }
+ public function getOutputShape(): array {
+ return ['override_output' => new ShapeDescriptor('Override Out', '', EShapeType::Number)];
+ }
+}
+
/**
* @group DB
*/
@@ -295,9 +533,10 @@ class TaskProcessingTest extends \Test\TestCase {
private RegistrationContext $registrationContext;
private TaskMapper $taskMapper;
private IJobList $jobList;
- private IAppData $appData;
- private \OCP\Share\IManager $shareManager;
+ private IUserMountCache $userMountCache;
private IRootFolder $rootFolder;
+ private IConfig $config;
+ private IAppConfig $appConfig;
public const TEST_USER = 'testuser';
@@ -314,9 +553,13 @@ class TaskProcessingTest extends \Test\TestCase {
FailingTextProcessingSummaryProvider::class => new FailingTextProcessingSummaryProvider(),
SuccessfulTextToImageProvider::class => new SuccessfulTextToImageProvider(),
FailingTextToImageProvider::class => new FailingTextToImageProvider(),
+ ExternalProvider::class => new ExternalProvider(),
+ ConflictingExternalProvider::class => new ConflictingExternalProvider(),
+ ExternalTaskType::class => new ExternalTaskType(),
+ ConflictingExternalTaskType::class => new ConflictingExternalTaskType(),
];
- $userManager = \OCP\Server::get(IUserManager::class);
+ $userManager = Server::get(IUserManager::class);
if (!$userManager->userExists(self::TEST_USER)) {
$userManager->createUser(self::TEST_USER, 'test');
}
@@ -329,80 +572,89 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher = new EventDispatcher(
new \Symfony\Component\EventDispatcher\EventDispatcher(),
$this->serverContainer,
- \OC::$server->get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$this->registrationContext = $this->createMock(RegistrationContext::class);
$this->coordinator = $this->createMock(Coordinator::class);
$this->coordinator->expects($this->any())->method('getRegistrationContext')->willReturn($this->registrationContext);
- $this->rootFolder = \OCP\Server::get(IRootFolder::class);
+ $this->rootFolder = Server::get(IRootFolder::class);
- $this->taskMapper = \OCP\Server::get(TaskMapper::class);
+ $this->taskMapper = Server::get(TaskMapper::class);
$this->jobList = $this->createPartialMock(DummyJobList::class, ['add']);
- $this->jobList->expects($this->any())->method('add')->willReturnCallback(function () {
+ $this->jobList->expects($this->any())->method('add')->willReturnCallback(function (): void {
});
- $config = $this->createMock(IConfig::class);
- $config->method('getAppValue')
- ->with('core', 'ai.textprocessing_provider_preferences', '')
- ->willReturn('');
-
$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-
- $textProcessingManager = new \OC\TextProcessing\Manager(
- $this->serverContainer,
- $this->coordinator,
- \OC::$server->get(LoggerInterface::class),
- $this->jobList,
- \OC::$server->get(\OC\TextProcessing\Db\TaskMapper::class),
- \OC::$server->get(IConfig::class),
- );
+ $this->configureEventDispatcherMock();
$text2imageManager = new \OC\TextToImage\Manager(
$this->serverContainer,
$this->coordinator,
- \OC::$server->get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
$this->jobList,
- \OC::$server->get(\OC\TextToImage\Db\TaskMapper::class),
- \OC::$server->get(IConfig::class),
- \OC::$server->get(IAppDataFactory::class),
+ Server::get(\OC\TextToImage\Db\TaskMapper::class),
+ Server::get(IConfig::class),
+ Server::get(IAppDataFactory::class),
);
- $this->shareManager = $this->createMock(\OCP\Share\IManager::class);
-
+ $this->userMountCache = $this->createMock(IUserMountCache::class);
+ $this->config = Server::get(IConfig::class);
+ $this->appConfig = Server::get(IAppConfig::class);
$this->manager = new Manager(
+ $this->appConfig,
$this->coordinator,
$this->serverContainer,
- \OC::$server->get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
$this->taskMapper,
$this->jobList,
$this->eventDispatcher,
- \OC::$server->get(IAppDataFactory::class),
- \OC::$server->get(IRootFolder::class),
- $textProcessingManager,
+ Server::get(IAppDataFactory::class),
+ Server::get(IRootFolder::class),
$text2imageManager,
- \OC::$server->get(ISpeechToTextManager::class),
- $this->shareManager,
+ $this->userMountCache,
+ Server::get(IClientService::class),
+ Server::get(IAppManager::class),
+ $userManager,
+ Server::get(IUserSession::class),
+ Server::get(ICacheFactory::class),
);
}
- private function getFile(string $name, string $content): \OCP\Files\File {
+ private function getFile(string $name, string $content): File {
$folder = $this->rootFolder->getUserFolder(self::TEST_USER);
$file = $folder->newFile($name, $content);
return $file;
}
- public function testShouldNotHaveAnyProviders() {
+ public function testShouldNotHaveAnyProviders(): void {
$this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([]);
self::assertCount(0, $this->manager->getAvailableTaskTypes());
self::assertFalse($this->manager->hasProviders());
- self::expectException(\OCP\TaskProcessing\Exception\PreConditionNotMetException::class);
+ self::expectException(PreConditionNotMetException::class);
$this->manager->scheduleTask(new Task(TextToText::ID, ['input' => 'Hello'], 'test', null));
}
- public function testProviderShouldBeRegisteredAndTaskFailValidation() {
+ public function testProviderShouldBeRegisteredAndTaskTypeDisabled(): void {
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
+ new ServiceRegistration('test', SuccessfulSyncProvider::class)
+ ]);
+ $taskProcessingTypeSettings = [
+ TextToText::ID => false,
+ ];
+ $this->appConfig->setValueString('core', 'ai.taskprocessing_type_preferences', json_encode($taskProcessingTypeSettings), lazy: true);
+ self::assertCount(0, $this->manager->getAvailableTaskTypes());
+ self::assertCount(1, $this->manager->getAvailableTaskTypes(true));
+ self::assertTrue($this->manager->hasProviders());
+ self::expectException(PreConditionNotMetException::class);
+ $this->manager->scheduleTask(new Task(TextToText::ID, ['input' => 'Hello'], 'test', null));
+ }
+
+
+ public function testProviderShouldBeRegisteredAndTaskFailValidation(): void {
+ $this->appConfig->setValueString('core', 'ai.taskprocessing_type_preferences', '', lazy: true);
$this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
new ServiceRegistration('test', BrokenSyncProvider::class)
]);
@@ -414,18 +666,22 @@ class TaskProcessingTest extends \Test\TestCase {
$this->manager->scheduleTask($task);
}
- public function testProviderShouldBeRegisteredAndTaskWithFilesFailValidation() {
- $this->shareManager->expects($this->any())->method('getAccessList')->willReturn(['users' => []]);
+ public function testProviderShouldBeRegisteredAndTaskWithFilesFailValidation(): void {
$this->registrationContext->expects($this->any())->method('getTaskProcessingTaskTypes')->willReturn([
new ServiceRegistration('test', AudioToImage::class)
]);
$this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
new ServiceRegistration('test', AsyncProvider::class)
]);
- $this->shareManager->expects($this->any())->method('getAccessList')->willReturn(['users' => [null]]);
- self::assertCount(1, $this->manager->getAvailableTaskTypes());
+ $user = $this->createMock(IUser::class);
+ $user->expects($this->any())->method('getUID')->willReturn(null);
+ $mount = $this->createMock(ICachedMountInfo::class);
+ $mount->expects($this->any())->method('getUser')->willReturn($user);
+ $this->userMountCache->expects($this->any())->method('getMountsForFileId')->willReturn([$mount]);
+ self::assertCount(1, $this->manager->getAvailableTaskTypes());
self::assertTrue($this->manager->hasProviders());
+
$audioId = $this->getFile('audioInput', 'Hello')->getId();
$task = new Task(AudioToImage::ID, ['audio' => $audioId], 'test', null);
self::assertNull($task->getId());
@@ -434,7 +690,7 @@ class TaskProcessingTest extends \Test\TestCase {
$this->manager->scheduleTask($task);
}
- public function testProviderShouldBeRegisteredAndFail() {
+ public function testProviderShouldBeRegisteredAndFail(): void {
$this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
new ServiceRegistration('test', FailingSyncProvider::class)
]);
@@ -449,11 +705,11 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskFailedEvent::class));
- $backgroundJob = new \OC\TaskProcessing\SynchronousBackgroundJob(
- \OCP\Server::get(ITimeFactory::class),
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
$this->manager,
$this->jobList,
- \OCP\Server::get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$backgroundJob->start($this->jobList);
@@ -462,7 +718,7 @@ class TaskProcessingTest extends \Test\TestCase {
self::assertEquals(FailingSyncProvider::ERROR_MESSAGE, $task->getErrorMessage());
}
- public function testProviderShouldBeRegisteredAndFailOutputValidation() {
+ public function testProviderShouldBeRegisteredAndFailOutputValidation(): void {
$this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
new ServiceRegistration('test', BrokenSyncProvider::class)
]);
@@ -477,11 +733,11 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskFailedEvent::class));
- $backgroundJob = new \OC\TaskProcessing\SynchronousBackgroundJob(
- \OCP\Server::get(ITimeFactory::class),
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
$this->manager,
$this->jobList,
- \OCP\Server::get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$backgroundJob->start($this->jobList);
@@ -490,7 +746,7 @@ class TaskProcessingTest extends \Test\TestCase {
self::assertEquals('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->getErrorMessage());
}
- public function testProviderShouldBeRegisteredAndRun() {
+ public function testProviderShouldBeRegisteredAndRun(): void {
$this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
new ServiceRegistration('test', SuccessfulSyncProvider::class)
]);
@@ -522,28 +778,70 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskSuccessfulEvent::class));
- $backgroundJob = new \OC\TaskProcessing\SynchronousBackgroundJob(
- \OCP\Server::get(ITimeFactory::class),
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
+ $this->manager,
+ $this->jobList,
+ Server::get(LoggerInterface::class),
+ );
+ $backgroundJob->start($this->jobList);
+
+ $task = $this->manager->getTask($task->getId());
+ self::assertEquals(Task::STATUS_SUCCESSFUL, $task->getStatus(), 'Status is ' . $task->getStatus() . ' with error message: ' . $task->getErrorMessage());
+ self::assertEquals(['output' => 'Hello'], $task->getOutput());
+ self::assertEquals(1, $task->getProgress());
+ }
+
+ public function testTaskTypeExplicitlyEnabled(): void {
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
+ new ServiceRegistration('test', SuccessfulSyncProvider::class)
+ ]);
+
+ $taskProcessingTypeSettings = [
+ TextToText::ID => true,
+ ];
+ $this->appConfig->setValueString('core', 'ai.taskprocessing_type_preferences', json_encode($taskProcessingTypeSettings), lazy: true);
+
+ self::assertCount(1, $this->manager->getAvailableTaskTypes());
+
+ self::assertTrue($this->manager->hasProviders());
+ $task = new Task(TextToText::ID, ['input' => 'Hello'], 'test', null);
+ self::assertNull($task->getId());
+ self::assertEquals(Task::STATUS_UNKNOWN, $task->getStatus());
+ $this->manager->scheduleTask($task);
+ self::assertNotNull($task->getId());
+ self::assertEquals(Task::STATUS_SCHEDULED, $task->getStatus());
+
+ $this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskSuccessfulEvent::class));
+
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
$this->manager,
$this->jobList,
- \OCP\Server::get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$backgroundJob->start($this->jobList);
$task = $this->manager->getTask($task->getId());
- self::assertEquals(Task::STATUS_SUCCESSFUL, $task->getStatus(), 'Status is '. $task->getStatus() . ' with error message: ' . $task->getErrorMessage());
+ self::assertEquals(Task::STATUS_SUCCESSFUL, $task->getStatus(), 'Status is ' . $task->getStatus() . ' with error message: ' . $task->getErrorMessage());
self::assertEquals(['output' => 'Hello'], $task->getOutput());
self::assertEquals(1, $task->getProgress());
}
- public function testAsyncProviderWithFilesShouldBeRegisteredAndRun() {
+ public function testAsyncProviderWithFilesShouldBeRegisteredAndRunReturningRawFileData(): void {
$this->registrationContext->expects($this->any())->method('getTaskProcessingTaskTypes')->willReturn([
new ServiceRegistration('test', AudioToImage::class)
]);
$this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
new ServiceRegistration('test', AsyncProvider::class)
]);
- $this->shareManager->expects($this->any())->method('getAccessList')->willReturn(['users' => ['testuser' => 1]]);
+
+ $user = $this->createMock(IUser::class);
+ $user->expects($this->any())->method('getUID')->willReturn('testuser');
+ $mount = $this->createMock(ICachedMountInfo::class);
+ $mount->expects($this->any())->method('getUser')->willReturn($user);
+ $this->userMountCache->expects($this->any())->method('getMountsForFileId')->willReturn([$mount]);
+
self::assertCount(1, $this->manager->getAvailableTaskTypes());
self::assertTrue($this->manager->hasProviders());
@@ -567,7 +865,7 @@ class TaskProcessingTest extends \Test\TestCase {
$this->manager->setTaskProgress($task2->getId(), 0.1);
$input = $this->manager->prepareInputData($task2);
self::assertTrue(isset($input['audio']));
- self::assertInstanceOf(\OCP\Files\File::class, $input['audio']);
+ self::assertInstanceOf(File::class, $input['audio']);
self::assertEquals($audioId, $input['audio']->getId());
$this->manager->setTaskResult($task2->getId(), null, ['spectrogram' => 'World']);
@@ -578,23 +876,75 @@ class TaskProcessingTest extends \Test\TestCase {
self::assertTrue(isset($task->getOutput()['spectrogram']));
$node = $this->rootFolder->getFirstNodeByIdInPath($task->getOutput()['spectrogram'], '/' . $this->rootFolder->getAppDataDirectoryName() . '/');
self::assertNotNull($node);
- self::assertInstanceOf(\OCP\Files\File::class, $node);
+ self::assertInstanceOf(File::class, $node);
+ self::assertEquals('World', $node->getContent());
+ }
+
+ public function testAsyncProviderWithFilesShouldBeRegisteredAndRunReturningFileIds(): void {
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingTaskTypes')->willReturn([
+ new ServiceRegistration('test', AudioToImage::class)
+ ]);
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
+ new ServiceRegistration('test', AsyncProvider::class)
+ ]);
+ $user = $this->createMock(IUser::class);
+ $user->expects($this->any())->method('getUID')->willReturn('testuser');
+ $mount = $this->createMock(ICachedMountInfo::class);
+ $mount->expects($this->any())->method('getUser')->willReturn($user);
+ $this->userMountCache->expects($this->any())->method('getMountsForFileId')->willReturn([$mount]);
+ self::assertCount(1, $this->manager->getAvailableTaskTypes());
+
+ self::assertTrue($this->manager->hasProviders());
+ $audioId = $this->getFile('audioInput', 'Hello')->getId();
+ $task = new Task(AudioToImage::ID, ['audio' => $audioId], 'test', 'testuser');
+ self::assertNull($task->getId());
+ self::assertEquals(Task::STATUS_UNKNOWN, $task->getStatus());
+ $this->manager->scheduleTask($task);
+ self::assertNotNull($task->getId());
+ self::assertEquals(Task::STATUS_SCHEDULED, $task->getStatus());
+
+ // Task object retrieved from db is up-to-date
+ $task2 = $this->manager->getTask($task->getId());
+ self::assertEquals($task->getId(), $task2->getId());
+ self::assertEquals(['audio' => $audioId], $task2->getInput());
+ self::assertNull($task2->getOutput());
+ self::assertEquals(Task::STATUS_SCHEDULED, $task2->getStatus());
+
+ $this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskSuccessfulEvent::class));
+
+ $this->manager->setTaskProgress($task2->getId(), 0.1);
+ $input = $this->manager->prepareInputData($task2);
+ self::assertTrue(isset($input['audio']));
+ self::assertInstanceOf(File::class, $input['audio']);
+ self::assertEquals($audioId, $input['audio']->getId());
+
+ $outputFileId = $this->getFile('audioOutput', 'World')->getId();
+
+ $this->manager->setTaskResult($task2->getId(), null, ['spectrogram' => $outputFileId], true);
+
+ $task = $this->manager->getTask($task->getId());
+ self::assertEquals(Task::STATUS_SUCCESSFUL, $task->getStatus());
+ self::assertEquals(1, $task->getProgress());
+ self::assertTrue(isset($task->getOutput()['spectrogram']));
+ $node = $this->rootFolder->getFirstNodeById($task->getOutput()['spectrogram']);
+ self::assertNotNull($node, 'fileId:' . $task->getOutput()['spectrogram']);
+ self::assertInstanceOf(File::class, $node);
self::assertEquals('World', $node->getContent());
}
- public function testNonexistentTask() {
- $this->expectException(\OCP\TaskProcessing\Exception\NotFoundException::class);
+ public function testNonexistentTask(): void {
+ $this->expectException(NotFoundException::class);
$this->manager->getTask(2147483646);
}
- public function testOldTasksShouldBeCleanedUp() {
+ public function testOldTasksShouldBeCleanedUp(): void {
$currentTime = new \DateTime('now');
$timeFactory = $this->createMock(ITimeFactory::class);
$timeFactory->expects($this->any())->method('getDateTime')->willReturnCallback(fn () => $currentTime);
$timeFactory->expects($this->any())->method('getTime')->willReturnCallback(fn () => $currentTime->getTimestamp());
$this->taskMapper = new TaskMapper(
- \OCP\Server::get(IDBConnection::class),
+ Server::get(IDBConnection::class),
$timeFactory,
);
@@ -608,11 +958,11 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskSuccessfulEvent::class));
- $backgroundJob = new \OC\TaskProcessing\SynchronousBackgroundJob(
- \OCP\Server::get(ITimeFactory::class),
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
$this->manager,
$this->jobList,
- \OCP\Server::get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$backgroundJob->start($this->jobList);
@@ -623,8 +973,8 @@ class TaskProcessingTest extends \Test\TestCase {
$bgJob = new RemoveOldTasksBackgroundJob(
$timeFactory,
$this->taskMapper,
- \OC::$server->get(LoggerInterface::class),
- \OCP\Server::get(IAppDataFactory::class),
+ Server::get(LoggerInterface::class),
+ Server::get(IAppDataFactory::class),
);
$bgJob->setArgument([]);
$bgJob->start($this->jobList);
@@ -633,7 +983,7 @@ class TaskProcessingTest extends \Test\TestCase {
$this->manager->getTask($task->getId());
}
- public function testShouldTransparentlyHandleTextProcessingProviders() {
+ public function testShouldTransparentlyHandleTextProcessingProviders(): void {
$this->registrationContext->expects($this->any())->method('getTextProcessingProviders')->willReturn([
new ServiceRegistration('test', SuccessfulTextProcessingSummaryProvider::class)
]);
@@ -648,11 +998,11 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskSuccessfulEvent::class));
- $backgroundJob = new \OC\TaskProcessing\SynchronousBackgroundJob(
- \OCP\Server::get(ITimeFactory::class),
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
$this->manager,
$this->jobList,
- \OCP\Server::get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$backgroundJob->start($this->jobList);
@@ -664,7 +1014,7 @@ class TaskProcessingTest extends \Test\TestCase {
self::assertTrue($this->providers[SuccessfulTextProcessingSummaryProvider::class]->ran);
}
- public function testShouldTransparentlyHandleFailingTextProcessingProviders() {
+ public function testShouldTransparentlyHandleFailingTextProcessingProviders(): void {
$this->registrationContext->expects($this->any())->method('getTextProcessingProviders')->willReturn([
new ServiceRegistration('test', FailingTextProcessingSummaryProvider::class)
]);
@@ -679,11 +1029,11 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskFailedEvent::class));
- $backgroundJob = new \OC\TaskProcessing\SynchronousBackgroundJob(
- \OCP\Server::get(ITimeFactory::class),
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
$this->manager,
$this->jobList,
- \OCP\Server::get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$backgroundJob->start($this->jobList);
@@ -694,7 +1044,7 @@ class TaskProcessingTest extends \Test\TestCase {
self::assertTrue($this->providers[FailingTextProcessingSummaryProvider::class]->ran);
}
- public function testShouldTransparentlyHandleText2ImageProviders() {
+ public function testShouldTransparentlyHandleText2ImageProviders(): void {
$this->registrationContext->expects($this->any())->method('getTextToImageProviders')->willReturn([
new ServiceRegistration('test', SuccessfulTextToImageProvider::class)
]);
@@ -709,11 +1059,11 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskSuccessfulEvent::class));
- $backgroundJob = new \OC\TaskProcessing\SynchronousBackgroundJob(
- \OCP\Server::get(ITimeFactory::class),
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
$this->manager,
$this->jobList,
- \OCP\Server::get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$backgroundJob->start($this->jobList);
@@ -726,11 +1076,11 @@ class TaskProcessingTest extends \Test\TestCase {
self::assertTrue($this->providers[SuccessfulTextToImageProvider::class]->ran);
$node = $this->rootFolder->getFirstNodeByIdInPath($task->getOutput()['images'][0], '/' . $this->rootFolder->getAppDataDirectoryName() . '/');
self::assertNotNull($node);
- self::assertInstanceOf(\OCP\Files\File::class, $node);
+ self::assertInstanceOf(File::class, $node);
self::assertEquals('test', $node->getContent());
}
- public function testShouldTransparentlyHandleFailingText2ImageProviders() {
+ public function testShouldTransparentlyHandleFailingText2ImageProviders(): void {
$this->registrationContext->expects($this->any())->method('getTextToImageProviders')->willReturn([
new ServiceRegistration('test', FailingTextToImageProvider::class)
]);
@@ -745,11 +1095,11 @@ class TaskProcessingTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new IsInstanceOf(TaskFailedEvent::class));
- $backgroundJob = new \OC\TaskProcessing\SynchronousBackgroundJob(
- \OCP\Server::get(ITimeFactory::class),
+ $backgroundJob = new SynchronousBackgroundJob(
+ Server::get(ITimeFactory::class),
$this->manager,
$this->jobList,
- \OCP\Server::get(LoggerInterface::class),
+ Server::get(LoggerInterface::class),
);
$backgroundJob->start($this->jobList);
@@ -759,4 +1109,190 @@ class TaskProcessingTest extends \Test\TestCase {
self::assertEquals('ERROR', $task->getErrorMessage());
self::assertTrue($this->providers[FailingTextToImageProvider::class]->ran);
}
+
+ public function testMergeProvidersLocalAndEvent() {
+ // Arrange: Local provider registered, DIFFERENT external provider via event
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
+ new ServiceRegistration('test', SuccessfulSyncProvider::class)
+ ]);
+ $this->registrationContext->expects($this->any())->method('getTextProcessingProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getTextToImageProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getSpeechToTextProviders')->willReturn([]);
+
+ $externalProvider = new ExternalProvider(); // ID = 'event:external:provider'
+ $this->configureEventDispatcherMock(providersToAdd: [$externalProvider]);
+ $this->manager = $this->createManagerInstance();
+
+ // Act
+ $providers = $this->manager->getProviders();
+
+ // Assert: Both providers should be present
+ self::assertArrayHasKey(SuccessfulSyncProvider::ID, $providers);
+ self::assertInstanceOf(SuccessfulSyncProvider::class, $providers[SuccessfulSyncProvider::ID]);
+ self::assertArrayHasKey(ExternalProvider::ID, $providers);
+ self::assertInstanceOf(ExternalProvider::class, $providers[ExternalProvider::ID]);
+ self::assertCount(2, $providers);
+ }
+
+ public function testGetProvidersIncludesExternalViaEvent() {
+ // Arrange: No local providers, one external provider via event
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getTextProcessingProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getTextToImageProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getSpeechToTextProviders')->willReturn([]);
+
+
+ $externalProvider = new ExternalProvider();
+ $this->configureEventDispatcherMock(providersToAdd: [$externalProvider]);
+ $this->manager = $this->createManagerInstance(); // Create manager with configured mocks
+
+ // Act
+ $providers = $this->manager->getProviders(); // Returns ID-indexed array
+
+ // Assert
+ self::assertArrayHasKey(ExternalProvider::ID, $providers);
+ self::assertInstanceOf(ExternalProvider::class, $providers[ExternalProvider::ID]);
+ self::assertCount(1, $providers);
+ self::assertTrue($this->manager->hasProviders());
+ }
+
+ public function testGetAvailableTaskTypesIncludesExternalViaEvent() {
+ // Arrange: No local types/providers, one external type and provider via event
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingTaskTypes')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getTextProcessingProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getTextToImageProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getSpeechToTextProviders')->willReturn([]);
+
+ $externalProvider = new ExternalProvider(); // Provides ExternalTaskType
+ $externalTaskType = new ExternalTaskType();
+ $this->configureEventDispatcherMock(
+ providersToAdd: [$externalProvider],
+ taskTypesToAdd: [$externalTaskType]
+ );
+ $this->manager = $this->createManagerInstance();
+
+ // Act
+ $availableTypes = $this->manager->getAvailableTaskTypes();
+
+ // Assert
+ self::assertArrayHasKey(ExternalTaskType::ID, $availableTypes);
+ self::assertEquals(ExternalTaskType::ID, $externalProvider->getTaskTypeId(), 'Test Sanity: Provider must handle the Task Type');
+ self::assertEquals('External Task Type via Event', $availableTypes[ExternalTaskType::ID]['name']);
+ // Check if shapes match the external type/provider
+ self::assertArrayHasKey('external_input', $availableTypes[ExternalTaskType::ID]['inputShape']);
+ self::assertArrayHasKey('external_output', $availableTypes[ExternalTaskType::ID]['outputShape']);
+ self::assertEmpty($availableTypes[ExternalTaskType::ID]['optionalInputShape']); // From ExternalProvider
+ }
+
+ public function testLocalProviderWinsConflictWithEvent() {
+ // Arrange: Local provider registered, conflicting external provider via event
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
+ new ServiceRegistration('test', SuccessfulSyncProvider::class)
+ ]);
+ $this->registrationContext->expects($this->any())->method('getTextProcessingProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getTextToImageProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getSpeechToTextProviders')->willReturn([]);
+
+ $conflictingExternalProvider = new ConflictingExternalProvider(); // ID = 'test:sync:success'
+ $this->configureEventDispatcherMock(providersToAdd: [$conflictingExternalProvider]);
+ $this->manager = $this->createManagerInstance();
+
+ // Act
+ $providers = $this->manager->getProviders();
+
+ // Assert: Only the local provider should be present for the conflicting ID
+ self::assertArrayHasKey(SuccessfulSyncProvider::ID, $providers);
+ self::assertInstanceOf(SuccessfulSyncProvider::class, $providers[SuccessfulSyncProvider::ID]);
+ self::assertCount(1, $providers); // Ensure no extra provider was added
+ }
+
+ public function testMergeTaskTypesLocalAndEvent() {
+ // Arrange: Local type registered, DIFFERENT external type via event
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
+ new ServiceRegistration('test', AsyncProvider::class)
+ ]);
+ $this->registrationContext->expects($this->any())->method('getTaskProcessingTaskTypes')->willReturn([
+ new ServiceRegistration('test', AudioToImage::class)
+ ]);
+ $this->registrationContext->expects($this->any())->method('getTextProcessingProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getTextToImageProviders')->willReturn([]);
+ $this->registrationContext->expects($this->any())->method('getSpeechToTextProviders')->willReturn([]);
+
+ $externalTaskType = new ExternalTaskType(); // ID = 'event:external:tasktype'
+ $externalProvider = new ExternalProvider(); // Handles 'event:external:tasktype'
+ $this->configureEventDispatcherMock(
+ providersToAdd: [$externalProvider],
+ taskTypesToAdd: [$externalTaskType]
+ );
+ $this->manager = $this->createManagerInstance();
+
+ // Act
+ $availableTypes = $this->manager->getAvailableTaskTypes();
+
+ // Assert: Both task types should be available
+ self::assertArrayHasKey(AudioToImage::ID, $availableTypes);
+ self::assertEquals(AudioToImage::class, $availableTypes[AudioToImage::ID]['name']);
+
+ self::assertArrayHasKey(ExternalTaskType::ID, $availableTypes);
+ self::assertEquals('External Task Type via Event', $availableTypes[ExternalTaskType::ID]['name']);
+
+ self::assertCount(2, $availableTypes);
+ }
+
+ private function createManagerInstance(): Manager {
+ // Clear potentially cached config values if needed
+ $this->appConfig->deleteKey('core', 'ai.taskprocessing_type_preferences');
+
+ // Re-create Text2ImageManager if its state matters or mocks change
+ $text2imageManager = new \OC\TextToImage\Manager(
+ $this->serverContainer,
+ $this->coordinator,
+ Server::get(LoggerInterface::class),
+ $this->jobList,
+ Server::get(\OC\TextToImage\Db\TaskMapper::class),
+ $this->config, // Use the shared config mock
+ Server::get(IAppDataFactory::class),
+ );
+
+ return new Manager(
+ $this->appConfig,
+ $this->coordinator,
+ $this->serverContainer,
+ Server::get(LoggerInterface::class),
+ $this->taskMapper,
+ $this->jobList,
+ $this->eventDispatcher, // Use the potentially reconfigured mock
+ Server::get(IAppDataFactory::class),
+ $this->rootFolder,
+ $text2imageManager,
+ $this->userMountCache,
+ Server::get(IClientService::class),
+ Server::get(IAppManager::class),
+ Server::get(IUserManager::class),
+ Server::get(IUserSession::class),
+ Server::get(ICacheFactory::class),
+ );
+ }
+
+ private function configureEventDispatcherMock(
+ array $providersToAdd = [],
+ array $taskTypesToAdd = [],
+ ?int $expectedCalls = null,
+ ): void {
+ $dispatchExpectation = $expectedCalls === null ? $this->any() : $this->exactly($expectedCalls);
+
+ $this->eventDispatcher->expects($dispatchExpectation)
+ ->method('dispatchTyped')
+ ->willReturnCallback(function (object $event) use ($providersToAdd, $taskTypesToAdd): void {
+ if ($event instanceof GetTaskProcessingProvidersEvent) {
+ foreach ($providersToAdd as $providerInstance) {
+ $event->addProvider($providerInstance);
+ }
+ foreach ($taskTypesToAdd as $taskTypeInstance) {
+ $event->addTaskType($taskTypeInstance);
+ }
+ }
+ });
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 06:55:38 +0000