diff --git a/core/Command/TaskProcessing/EnabledCommand.php b/core/Command/TaskProcessing/EnabledCommand.php new file mode 100644 index 0000000000000..d758466040b4a --- /dev/null +++ b/core/Command/TaskProcessing/EnabledCommand.php @@ -0,0 +1,60 @@ +setName('taskprocessing:task:enabled') + ->setDescription('Enable or disable a task type') + ->addArgument( + 'task-type-id', + InputArgument::REQUIRED, + 'ID of the task type to configure' + ) + ->addArgument( + 'enabled', + InputArgument::REQUIRED, + 'status of the task type availability. Set 1 to enable and 0 to disable.' + ); + parent::configure(); + } + + protected function execute(InputInterface $input, OutputInterface $output): int { + $enabled = (bool)$input->getArgument('enabled'); + $taskType = $input->getArgument('task-type-id'); + $json = $this->config->getAppValue('core', 'ai.taskprocessing_type_preferences'); + if ($json === '') { + $taskTypeSettings = []; + } else { + $taskTypeSettings = json_decode($json, true); + } + if ($enabled) { + $taskTypeSettings[$taskType] = true; + } else { + $taskTypeSettings[$taskType] = false; + } + + + $this->config->setAppValue('core', 'ai.taskprocessing_type_preferences', json_encode($taskTypeSettings)); + $this->writeArrayInOutputFormat($input, $output, $taskTypeSettings); + return 0; + } +} diff --git a/core/register_command.php b/core/register_command.php index 08a01d7ff6e08..62305d75a30a2 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -147,6 +147,7 @@ $application->add(Server::get(Command\FilesMetadata\Get::class)); $application->add(Server::get(Command\TaskProcessing\GetCommand::class)); + $application->add(Server::get(Command\TaskProcessing\EnabledCommand::class)); $application->add(Server::get(Command\TaskProcessing\ListCommand::class)); $application->add(Server::get(Command\TaskProcessing\Statistics::class)); diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index e515e3eff07e4..2f4c840b49756 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1263,6 +1263,7 @@ 'OC\\Core\\Command\\SystemTag\\Delete' => $baseDir . '/core/Command/SystemTag/Delete.php', 'OC\\Core\\Command\\SystemTag\\Edit' => $baseDir . '/core/Command/SystemTag/Edit.php', 'OC\\Core\\Command\\SystemTag\\ListCommand' => $baseDir . '/core/Command/SystemTag/ListCommand.php', + 'OC\\Core\\Command\\TaskProcessing\\EnabledCommand' => $baseDir . '/core/Command/TaskProcessing/EnabledCommand.php', 'OC\\Core\\Command\\TaskProcessing\\GetCommand' => $baseDir . '/core/Command/TaskProcessing/GetCommand.php', 'OC\\Core\\Command\\TaskProcessing\\ListCommand' => $baseDir . '/core/Command/TaskProcessing/ListCommand.php', 'OC\\Core\\Command\\TaskProcessing\\Statistics' => $baseDir . '/core/Command/TaskProcessing/Statistics.php', diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php index b07b2c0074bf5..09892528d3a46 100644 --- a/lib/composer/composer/autoload_psr4.php +++ b/lib/composer/composer/autoload_psr4.php @@ -10,5 +10,6 @@ 'OC\\' => array($baseDir . '/lib/private'), 'OCP\\' => array($baseDir . '/lib/public'), 'NCU\\' => array($baseDir . '/lib/unstable'), + 'Bamarni\\Composer\\Bin\\' => array($vendorDir . '/bamarni/composer-bin-plugin/src'), '' => array($baseDir . '/lib/private/legacy'), ); diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index cf2883c3070c5..c05e211649b50 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -21,6 +21,10 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 array ( 'NCU\\' => 4, ), + 'B' => + array ( + 'Bamarni\\Composer\\Bin\\' => 21, + ), ); public static $prefixDirsPsr4 = array ( @@ -40,6 +44,10 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 array ( 0 => __DIR__ . '/../../..' . '/lib/unstable', ), + 'Bamarni\\Composer\\Bin\\' => + array ( + 0 => __DIR__ . '/..' . '/bamarni/composer-bin-plugin/src', + ), ); public static $fallbackDirsPsr4 = array ( @@ -1304,6 +1312,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Command\\SystemTag\\Delete' => __DIR__ . '/../../..' . '/core/Command/SystemTag/Delete.php', 'OC\\Core\\Command\\SystemTag\\Edit' => __DIR__ . '/../../..' . '/core/Command/SystemTag/Edit.php', 'OC\\Core\\Command\\SystemTag\\ListCommand' => __DIR__ . '/../../..' . '/core/Command/SystemTag/ListCommand.php', + 'OC\\Core\\Command\\TaskProcessing\\EnabledCommand' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/EnabledCommand.php', 'OC\\Core\\Command\\TaskProcessing\\GetCommand' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/GetCommand.php', 'OC\\Core\\Command\\TaskProcessing\\ListCommand' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/ListCommand.php', 'OC\\Core\\Command\\TaskProcessing\\Statistics' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/Statistics.php', diff --git a/tests/lib/TaskProcessing/TaskProcessingTest.php b/tests/lib/TaskProcessing/TaskProcessingTest.php index 00e1da4acb5de..e55514ad9ae27 100644 --- a/tests/lib/TaskProcessing/TaskProcessingTest.php +++ b/tests/lib/TaskProcessing/TaskProcessingTest.php @@ -387,6 +387,7 @@ public function getExpectedRuntime(): int { */ class TaskProcessingTest extends \Test\TestCase { private IManager $manager; + private IManager $disabledTypeManager; private Coordinator $coordinator; private array $providers; private IServerContainer $serverContainer; @@ -442,11 +443,6 @@ protected function setUp(): void { $this->jobList->expects($this->any())->method('add')->willReturnCallback(function () { }); - $config = $this->createMock(IConfig::class); - $config->method('getAppValue') - ->with('core', 'ai.textprocessing_provider_preferences', '') - ->willReturn(''); - $this->eventDispatcher = $this->createMock(IEventDispatcher::class); $text2imageManager = new \OC\TextToImage\Manager( @@ -476,6 +472,34 @@ protected function setUp(): void { \OC::$server->get(IClientService::class), \OC::$server->get(IAppManager::class), ); + + + $taskProcessingTypeSettings = []; + $taskProcessingTypeSettings[TextToText::ID] = false; + + $disabledConfig = $this->createMock(IConfig::class); + $disabledConfig->method('getAppValue') + ->with('core', 'ai.taskprocessing_type_preferences', '') + ->willReturn(json_encode($taskProcessingTypeSettings)); + $disabledConfig->method('getAppValue') + ->with('core', 'ai.taskprocessing_provider_preferences', '') + ->willReturn(''); + + $this->disabledTypeManager = new Manager( + $disabledConfig, + $this->coordinator, + $this->serverContainer, + \OC::$server->get(LoggerInterface::class), + $this->taskMapper, + $this->jobList, + $this->eventDispatcher, + \OC::$server->get(IAppDataFactory::class), + \OC::$server->get(IRootFolder::class), + $text2imageManager, + $this->userMountCache, + \OC::$server->get(IClientService::class), + \OC::$server->get(IAppManager::class), + ); } private function getFile(string $name, string $content): \OCP\Files\File { @@ -492,6 +516,26 @@ public function testShouldNotHaveAnyProviders(): void { $this->manager->scheduleTask(new Task(TextToText::ID, ['input' => 'Hello'], 'test', null)); } + public function testProviderShouldBeRegisteredAndTaskTypeDisabled(): void { + $this->registrationContext->expects($this->any())->method('getTaskProcessingTaskTypes')->willReturn([ + new ServiceRegistration('test', TextToText::class) + ]); + $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([ + new ServiceRegistration('test', SuccessfulSyncProvider::class) + ]); + + /*$taskProcessingTypeSettings = []; + $taskProcessingTypeSettings[TextToText::ID] = false; + $this->config->method('getAppValue') + ->with('core', 'ai.taskprocessing_type_preferences', '') + ->willReturn(json_encode($taskProcessingTypeSettings));*/ + self::assertCount(0, $this->disabledTypeManager->getAvailableTaskTypes()); + self::assertCount(1, $this->disabledTypeManager->getAvailableTaskTypes(true)); + self::assertFalse($this->disabledTypeManager->hasProviders()); + self::expectException(\OCP\TaskProcessing\Exception\PreConditionNotMetException::class); + $this->disabledTypeManager->scheduleTask(new Task(TextToText::ID, ['input' => 'Hello'], 'test', null)); + } + public function testProviderShouldBeRegisteredAndTaskFailValidation(): void { $this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([ new ServiceRegistration('test', BrokenSyncProvider::class)