mirror of
https://github.com/nextcloud/server.git
synced 2026-02-18 18:28:50 -05:00
Add tasks::last_updated column and vacate tasks after a week
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
parent
1d3661ded9
commit
cb0f918d21
7 changed files with 143 additions and 2 deletions
|
|
@ -78,9 +78,16 @@ class Version28000Date20230616104802 extends SimpleMigrationStep {
|
|||
'length' => 32,
|
||||
'default' => '',
|
||||
]);
|
||||
$table->addColumn('last_updated', 'integer', [
|
||||
'notnull' => false,
|
||||
'length' => 4,
|
||||
'default' => 0,
|
||||
'unsigned' => true,
|
||||
]);
|
||||
|
||||
$table->setPrimaryKey(['id'], 'llm_tasks_id_index');
|
||||
$table->addUniqueIndex(['status', 'type'], 'llm_tasks_status_type');
|
||||
$table->addIndex(['last_updated'], 'llm_tasks_updated');
|
||||
}
|
||||
|
||||
return $schema;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ use OCP\LanguageModel\ILanguageModelTask;
|
|||
/**
|
||||
* @method setType(string $type)
|
||||
* @method string getType()
|
||||
* @method setLastUpdated(int $lastUpdated)
|
||||
* @method int getLastUpdated()
|
||||
* @method setInput(string $type)
|
||||
* @method string getInput()
|
||||
* @method setStatus(int $type)
|
||||
|
|
@ -18,6 +20,8 @@ use OCP\LanguageModel\ILanguageModelTask;
|
|||
* @method string getAppId()
|
||||
*/
|
||||
class Task extends Entity {
|
||||
protected $lastUpdated;
|
||||
|
||||
protected $type;
|
||||
protected $input;
|
||||
protected $status;
|
||||
|
|
@ -27,17 +31,18 @@ class Task extends Entity {
|
|||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
public static array $columns = ['id', 'type', 'input', 'output', 'status', 'user_id', 'app_id'];
|
||||
public static array $columns = ['id', 'last_updated', 'type', 'input', 'output', 'status', 'user_id', 'app_id'];
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
public static array $fields = ['id', 'type', 'input', 'output', 'status', 'userId', 'appId'];
|
||||
public static array $fields = ['id', 'lastUpdated', 'type', 'input', 'output', 'status', 'userId', 'appId'];
|
||||
|
||||
|
||||
public function __construct() {
|
||||
// add types in constructor
|
||||
$this->addType('id', 'integer');
|
||||
$this->addType('lastUpdated', 'integer');
|
||||
$this->addType('type', 'string');
|
||||
$this->addType('input', 'string');
|
||||
$this->addType('status', 'integer');
|
||||
|
|
@ -48,6 +53,7 @@ class Task extends Entity {
|
|||
public static function fromLanguageModelTask(ILanguageModelTask $task): Task {
|
||||
return Task::fromParams([
|
||||
'type' => $task->getType(),
|
||||
'lastUpdated' => time(),
|
||||
'status' => $task->getStatus(),
|
||||
'input' => $task->getInput(),
|
||||
'output' => $task->getOutput(),
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace OC\LanguageModel\Db;
|
||||
|
||||
use OCP\AppFramework\Db\DoesNotExistException;
|
||||
use OCP\AppFramework\Db\Entity;
|
||||
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
|
||||
use OCP\AppFramework\Db\QBMapper;
|
||||
use OCP\DB\Exception;
|
||||
|
|
@ -30,4 +31,21 @@ class TaskMapper extends QBMapper {
|
|||
->where($qb->expr()->eq('id', $qb->createPositionalParameter($id)));
|
||||
return $this->findEntity($qb);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $timeout
|
||||
* @return int the number of deleted tasks
|
||||
* @throws Exception
|
||||
*/
|
||||
public function deleteOlderThan(int $timeout): int {
|
||||
$qb = $this->db->getQueryBuilder();
|
||||
$qb->delete($this->tableName)
|
||||
->where($qb->expr()->lt('last_updated', $qb->createPositionalParameter(time() - $timeout)));
|
||||
return $qb->executeStatement();
|
||||
}
|
||||
|
||||
public function update(Entity $entity): Entity {
|
||||
$entity->setLastUpdated(time());
|
||||
return parent::update($entity);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
59
lib/private/LanguageModel/RemoveOldTasksBackgroundJob.php
Normal file
59
lib/private/LanguageModel/RemoveOldTasksBackgroundJob.php
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* @copyright Copyright (c) 2023 Marcel Klehr <mklehr@gmx.net>
|
||||
*
|
||||
* @author Marcel Klehr <mklehr@gmx.net>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
namespace OC\LanguageModel;
|
||||
|
||||
use OC\LanguageModel\Db\TaskMapper;
|
||||
use OCP\AppFramework\Utility\ITimeFactory;
|
||||
use OCP\BackgroundJob\TimedJob;
|
||||
use OCP\DB\Exception;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
class RemoveOldTasksBackgroundJob extends TimedJob {
|
||||
public const MAX_TASK_AGE_SECONDS = 60 * 50 * 24 * 7; // 1 week
|
||||
|
||||
public function __construct(
|
||||
ITimeFactory $timeFactory,
|
||||
private TaskMapper $taskMapper,
|
||||
private LoggerInterface $logger,
|
||||
|
||||
) {
|
||||
parent::__construct($timeFactory);
|
||||
$this->setInterval(60 * 60 * 24);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param mixed $argument
|
||||
* @inheritDoc
|
||||
*/
|
||||
protected function run($argument) {
|
||||
try {
|
||||
$this->taskMapper->deleteOlderThan(self::MAX_TASK_AGE_SECONDS);
|
||||
} catch (Exception $e) {
|
||||
$this->logger->warning('Failed to delete stale language model tasks', ['exception' => $e]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -34,6 +34,7 @@
|
|||
*/
|
||||
namespace OC;
|
||||
|
||||
use OC\Repair\AddRemoveOldTasksBackgroundJob;
|
||||
use OC\Repair\CleanUpAbandonedApps;
|
||||
use OCP\AppFramework\QueryException;
|
||||
use OCP\AppFramework\Utility\ITimeFactory;
|
||||
|
|
@ -210,6 +211,7 @@ class Repair implements IOutput {
|
|||
\OCP\Server::get(AddTokenCleanupJob::class),
|
||||
\OCP\Server::get(CleanUpAbandonedApps::class),
|
||||
\OCP\Server::get(AddMissingSecretJob::class),
|
||||
\OCP\Server::get(AddRemoveOldTasksBackgroundJob::class),
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
47
lib/private/Repair/AddRemoveOldTasksBackgroundJob.php
Normal file
47
lib/private/Repair/AddRemoveOldTasksBackgroundJob.php
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* @copyright 2023 Marcel Klehr <mklehr@gmx.net>
|
||||
*
|
||||
* @author Marcel Klehr <mklehr@gmx.net>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
namespace OC\Repair;
|
||||
|
||||
use OC\LanguageModel\RemoveOldTasksBackgroundJob;
|
||||
use OCP\BackgroundJob\IJobList;
|
||||
use OCP\Migration\IOutput;
|
||||
use OCP\Migration\IRepairStep;
|
||||
|
||||
class AddRemoveOldTasksBackgroundJob implements IRepairStep {
|
||||
private IJobList $jobList;
|
||||
|
||||
public function __construct(IJobList $jobList) {
|
||||
$this->jobList = $jobList;
|
||||
}
|
||||
|
||||
public function getName(): string {
|
||||
return 'Add language model tasks cleanup job';
|
||||
}
|
||||
|
||||
public function run(IOutput $output) {
|
||||
$this->jobList->add(RemoveOldTasksBackgroundJob::class);
|
||||
}
|
||||
}
|
||||
|
|
@ -53,6 +53,7 @@ use Exception;
|
|||
use InvalidArgumentException;
|
||||
use OC\Authentication\Token\PublicKeyTokenProvider;
|
||||
use OC\Authentication\Token\TokenCleanupJob;
|
||||
use OC\LanguageModel\RemoveOldTasksBackgroundJob;
|
||||
use OC\Log\Rotate;
|
||||
use OC\Preview\BackgroundCleanupJob;
|
||||
use OCP\AppFramework\Utility\ITimeFactory;
|
||||
|
|
@ -453,6 +454,7 @@ class Setup {
|
|||
$jobList->add(TokenCleanupJob::class);
|
||||
$jobList->add(Rotate::class);
|
||||
$jobList->add(BackgroundCleanupJob::class);
|
||||
$jobList->add(RemoveOldTasksBackgroundJob::class);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue