Skip to content

[TaskProcessing] Use taskprocessing in TextProcessing and STT managers #47601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julien-nc merged 11 commits into from
Aug 30, 2024
Merged

[TaskProcessing] Use taskprocessing in TextProcessing and STT managers #47601

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5ab0866
feat(textprocessing): TextProcessingManager::runTask calls TaskProces…
julien-nc Aug 28, 2024
04edeb5
feat(speech-to-text): SpeechToTextManager::transcribeFile calls TaskP…
julien-nc Aug 28, 2024
03b3d03
fix(taskprocessing): fix tests
julien-nc Aug 29, 2024
7be3a18
fix(TaskProcessing): Use OCP\Server::get instead of copying methods
marcelklehr Aug 30, 2024
de117d4
fix(SpeechToTextManager): Throw TaskProcessing Task failed
marcelklehr Aug 30, 2024
b06302e
fix(settings): Remove STT admin settings
marcelklehr Aug 30, 2024
a2b0874
fix(settings): Don't show built-in textprocessing task types in textp…
marcelklehr Aug 30, 2024
1e896a7
fix(TextProcessing): Don't run taskProcessing if task type is not ava…
marcelklehr Aug 30, 2024
41e3bde
fix(TaskProcessing): Fix namespace of TaskProcessingTest.php
marcelklehr Aug 30, 2024
95006d2
Revert "fix(TaskProcessing): Use OCP\Server::get instead of copying m…
marcelklehr Aug 30, 2024
122cb80
chore(assets): Recompile assets
nextcloud-command Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(taskprocessing): fix tests 
Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
@julien-nc
julien-nc committed Aug 30, 2024
commit 03b3d03b466b52033e5f63349aa7b570bb5a2fe2
12 changes: 0 additions & 12 deletions tests/lib/TaskProcessing/TaskProcessingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
use OCP\IServerContainer;
use OCP\IUser;
use OCP\IUserManager;
use OCP\SpeechToText\ISpeechToTextManager;
use OCP\TaskProcessing\EShapeType;
use OCP\TaskProcessing\Events\TaskFailedEvent;
use OCP\TaskProcessing\Events\TaskSuccessfulEvent;
Expand Down Expand Up @@ -450,15 +449,6 @@ protected function setUp(): void {

$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),
);

$text2imageManager = new \OC\TextToImage\Manager(
$this->serverContainer,
$this->coordinator,
Expand All @@ -481,9 +471,7 @@ protected function setUp(): void {
$this->eventDispatcher,
\OC::$server->get(IAppDataFactory::class),
\OC::$server->get(IRootFolder::class),
$textProcessingManager,
$text2imageManager,
\OC::$server->get(ISpeechToTextManager::class),
$this->userMountCache,
\OC::$server->get(IClientService::class),
\OC::$server->get(IAppManager::class),
Expand Down
6 changes: 5 additions & 1 deletion tests/lib/TextProcessing/TextProcessingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ public function getTaskType(): string {
}
}

/**
* @group DB
*/
class TextProcessingTest extends \Test\TestCase {
private IManager $manager;
private Coordinator $coordinator;
Expand Down Expand Up @@ -176,7 +179,8 @@ protected function setUp(): void {
\OC::$server->get(LoggerInterface::class),
$this->jobList,
$this->taskMapper,
$config
$config,
\OC::$server->get(\OCP\TaskProcessing\IManager::class),
);
}

Expand Down