Skip to content

Added a flag isActive to tasks api response to show wether a task is … #2005

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
s3inlc merged 5 commits into from
Mar 20, 2026
Merged

Added a flag isActive to tasks api response to show wether a task is … #2005

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca5232f
Added a flag isActive to tasks api response to show wether a task is …
Mar 18, 2026
d1c388d
changed flag to boolean
Mar 18, 2026
98c599f
Fixed wrong used variable
Mar 18, 2026
1043671
Moved unnesesary logic outside loop
Mar 18, 2026
438c174
Use the original status variable for the task status
Mar 18, 2026
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
47 changes: 23 additions & 24 deletions src/inc/apiv2/model/TaskAPI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,12 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre
$aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']);
}

$activeAgents = [];
if (is_null($aggregateFieldsets) || in_array("activeAgents", $aggregateFieldsets['task'])) {
$assignedAgents = [];
if (is_null($aggregateFieldsets) || in_array("assignedAgents", $aggregateFieldsets['task'])) {
$qF = new QueryFilter(Assignment::TASK_ID, $object->getId(), "=");
$activeAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]);
$aggregatedData["activeAgents"] = $activeAgents;
$assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]);
$aggregatedData["totalAssignedAgents"] = $assignedAgents;
}

$keyspace = $object->getKeyspace();
$keyspaceProgress = $object->getKeyspaceProgress();

Expand All @@ -195,34 +194,34 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre
if (is_null($aggregateFieldsets) || in_array("searched", $aggregateFieldsets['task'])) {
$aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace);
}

if (is_null($aggregateFieldsets) || in_array("status", $aggregateFieldsets['task'])) {
$qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "=");
$agg1 = new Aggregation(Chunk::CHECKPOINT, Aggregation::SUM);
$agg2 = new Aggregation(Chunk::SKIP, Aggregation::SUM);
$agg3 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::MAX);
$agg4 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::MAX);
$results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => $qF1], [$agg1, $agg2, $agg3, $agg4]);

$progress = $results[$agg1->getName()] - $results[$agg2->getName()];
$maxTime = max($results[$agg3->getName()], $results[$agg4->getName()]);

//status 1 is running, 2 is idle and 3 is completed

$chunks = null;
if (is_null($aggregateFieldsets) || in_array("isActive", $aggregateFieldsets['task'])) {
$qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "=");
$chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]);
//status 1 is running, 2 is idle and 3 is completed.
$status = 2;
if (time() - $maxTime < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && ($progress < $keyspace || $object->getUsePreprocessor() && $keyspace == DPrince::PRINCE_KEYSPACE)) {
$status = 1;
}

if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) {
$status = 3;
} else {
$now = time();
$chunkTimeOut = SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT);

foreach ($chunks as $chunk) {
if ($now - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < $chunkTimeOut && $chunk->getProgress() < 10000) {
$status = 1;
break;
}
}
}

$aggregatedData["status"] = $status;
}

if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['task'])) {
$qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "=");
$chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]);
if (!isset($chunks)){
$chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]);
}

$currentSpeed = 0;
$cProgress = 0;
Expand Down
Loading