Finish

This shows everything but still needs cleanup.

Author: Michael Vasseur

judge/judgedaemon.main.php

@@ -889,7 +889,7 @@ function fetch_executable_internal(
         foreach ($row as $judgeTask) {
             if (isset($judgeTask['output_visualizer_script_id'])) {
                 // Visualization of output which this host judged requested.
-                //$run_config = dj_json_decode($judgeTask['run_config']);
+                $run_config = dj_json_decode($judgeTask['run_config']);
                 $tmpfile = tempnam(TMPDIR, 'output_visualization_');
                 [$runpath, $error] = fetch_executable_internal(
                     $workdirpath,
@@ -902,32 +902,29 @@ function fetch_executable_internal(
                     continue;
                 }
 
-                $debug_cmd = implode(' ', array_map('dj_escapeshellarg',
-                    [$runpath, $workdir, $tmpfile]));
-                system($debug_cmd, $retval);
+                $teamoutput = $workdir . "/testcase" . sprintf('%05d', $judgeTask['testcase_id']) . '/1/program.out';
+                //$feedbackoutput = $wVorkdir . "/testcase" . sprintf('%05d', $judgeTask['testcase_id']) . '/1/feedback/visual.png';
+                var_dump("Working in", $teamoutput);
+                $visual_cmd = implode(' ', array_map('dj_escapeshellarg',
+                    [$runpath, $teamoutput, $tmpfile]));
+                var_dump($visual_cmd);
+                system($visual_cmd, $retval);
                 // FIXME: check retval
+                var_dump("testcase", $judgeTask['testcase_id']);
 
                 request(
-                    sprintf('judgehosts/add-debug-info/%s/%s', urlencode($myhost),
+                    sprintf('judgehosts/add-visual/%s/%s', urlencode($myhost),
                         urlencode((string)$judgeTask['judgetaskid'])),
                     'POST',
-                    ['full_debug' => rest_encode_file($tmpfile, false)],
+                    ['visual_output' => rest_encode_file($tmpfile, false),
+                     'testcase_id' => $judgeTask['testcase_id']],
                     false
                 );
+                $b = rest_encode_file($tmpfile, false);
+                var_dump($b);
                 unlink($tmpfile);
 
-                logmsg(LOG_INFO, "  ⇡ Uploading debug package of workdir $workdir.");
-            } else {
-                // Retrieving full team output for a particular testcase.
-                $testcasedir = $workdir . "/testcase" . sprintf('%05d', $judgeTask['testcase_id']);
-                request(
-                    sprintf('judgehosts/add-debug-info/%s/%s', urlencode($myhost),
-                        urlencode((string)$judgeTask['judgetaskid'])),
-                    'POST',
-                    ['output_run' => rest_encode_file($testcasedir . '/program.out', false)],
-                    false
-                );
-                logmsg(LOG_INFO, "  ⇡ Uploading full output of testcase $judgeTask[testcase_id].");
+                logmsg(LOG_INFO, "  ⇡ Uploading visual output of workdir $workdir.");
             }
         }
         continue;

webapp/migrations/Version20241017180659.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20241017180659 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE visualization (visualization_id INT UNSIGNED AUTO_INCREMENT NOT NULL COMMENT \'Visualization ID\', judgingid INT UNSIGNED DEFAULT NULL COMMENT \'Judging ID\', judgehostid INT UNSIGNED DEFAULT NULL COMMENT \'Judgehost ID\', testcaseid INT UNSIGNED DEFAULT NULL COMMENT \'Testcase ID\', filename VARCHAR(255) NOT NULL COMMENT \'Name of the file where we stored the visualization.\', INDEX IDX_E0936C40E0E4FC3E (judgehostid), INDEX IDX_E0936C40D360BB2B (testcaseid), INDEX judgingid (judgingid), PRIMARY KEY(visualization_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'Team output visualization.\' ');
+        $this->addSql('ALTER TABLE visualization ADD CONSTRAINT FK_E0936C405D5FEA72 FOREIGN KEY (judgingid) REFERENCES judging (judgingid) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE visualization ADD CONSTRAINT FK_E0936C40E0E4FC3E FOREIGN KEY (judgehostid) REFERENCES judgehost (judgehostid) ON DELETE SET NULL');
+        $this->addSql('ALTER TABLE visualization ADD CONSTRAINT FK_E0936C40D360BB2B FOREIGN KEY (testcaseid) REFERENCES testcase (testcaseid) ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE visualization DROP FOREIGN KEY FK_E0936C405D5FEA72');
+        $this->addSql('ALTER TABLE visualization DROP FOREIGN KEY FK_E0936C40E0E4FC3E');
+        $this->addSql('ALTER TABLE visualization DROP FOREIGN KEY FK_E0936C40D360BB2B');
+        $this->addSql('DROP TABLE visualization');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}

webapp/src/Controller/API/JudgehostController.php

@@ -2,6 +2,9 @@
 
 namespace App\Controller\API;
 
+use App\Entity\Visualization;
+use App\Entity\Testcase;
+
 use App\DataTransferObject\JudgehostFile;
 use App\Doctrine\DBAL\Types\JudgeTaskType;
 use App\Entity\Contest;
@@ -550,6 +553,60 @@ public function addDebugInfo(
         $this->em->flush();
     }
 
+    /**
+     * Add visual team output.
+     */
+    #[IsGranted('ROLE_JUDGEHOST')]
+    #[Rest\Post('/add-visual/{hostname}/{judgeTaskId<\d+>}')]
+    #[OA\Response(response: 200, description: 'When the visual output has been added')]
+    public function addVisualization(
+        Request $request,
+        #[OA\PathParameter(description: 'The hostname of the judgehost that wants to add the debug info')]
+        string $hostname,
+        #[OA\PathParameter(description: 'The ID of the judgetask to add', schema: new OA\Schema(type: 'integer'))]
+        int $judgeTaskId
+    ): void {
+        $judgeTask = $this->em->getRepository(JudgeTask::class)->find($judgeTaskId);
+        if ($judgeTask === null) {
+            throw new BadRequestHttpException(
+                'Inconsistent data, no judgetask known with judgetaskid = ' . $judgeTaskId . '.');
+        }
+
+        foreach (['visual_output', 'testcase_id'] as $argument) {
+            if (!$request->request->has($argument)) {
+                throw new BadRequestHttpException(
+                    sprintf("Argument '%s' is mandatory", $argument));
+            }
+        }
+
+        $judgehost = $this->em->getRepository(Judgehost::class)->findOneBy(['hostname' => $hostname]);
+        if (!$judgehost) {
+            throw new BadRequestHttpException("Who are you and why are you sending us any data?");
+        }
+
+        $judging = $this->em->getRepository(Judging::class)->find($judgeTask->getJobId());
+        if ($judging === null) {
+            throw new BadRequestHttpException(
+                'Inconsistent data, no judging known with judgingid = ' . $judgeTask->getJobId() . '.');
+        }
+        if ($tempFilename = tempnam($this->dj->getDomjudgeTmpDir(), "visual-")) {
+            $debug_package = base64_decode($request->request->get('visual_output'));
+            file_put_contents($tempFilename, $debug_package);
+            var_dump($debug_package);
+        }
+        // FIXME: error checking
+        var_dump("Received", $request->request->get('testcase_id'), "Processed" );
+        $testcase = $this->em->getRepository(Testcase::class)->findOneBy(['testcaseid' => $request->request->get('testcase_id')]);
+        $visualization = new Visualization();
+        $visualization
+            ->setJudgehost($judgehost)
+            ->setJudging($judging)
+            ->setTestcase($testcase)
+            ->setFilename($tempFilename);
+        $this->em->persist($visualization);
+        $this->em->flush();
+    }
+
     /**
      * Add one JudgingRun. When relevant, finalize the judging.
      * @throws DBALException
@@ -1186,7 +1243,7 @@ public function getFilesAction(
         return match ($type) {
             'source' => $this->getSourceFiles($id),
             'testcase' => $this->getTestcaseFiles($id),
-            'compare', 'compile', 'debug', 'run' => $this->getExecutableFiles($id),
+            'compare', 'compile', 'debug', 'run', 'output_visualization' => $this->getExecutableFiles($id),
             default => throw new BadRequestHttpException('Unknown type requested.'),
         };
     }
@@ -1656,7 +1713,7 @@ public function getJudgeTasksAction(Request $request): array
             ->createQueryBuilder()
             ->from(JudgeTask::class, 'jt')
             ->select('jt')
-            ->andWhere('jt.judgehost = :judgehost')
+            ->andWhere('jt.judgehost = :judgehost OR jt.judgehost IS NULL')
             //->andWhere('jt.starttime IS NULL')
             ->andWhere('jt.valid = 1')
             ->andWhere('jt.type = :type')
@@ -1703,7 +1760,7 @@ private function serializeJudgeTasks(array $judgeTasks, Judgehost $judgehost): a
         }
 
         $now = Utils::now();
-        $numUpdated = $this->em->getConnection()->executeStatement(
+        $numUpdated = sizeof($judgeTasks);/*$this->em->getConnection()->executeStatement(
             'UPDATE judgetask SET judgehostid = :judgehostid, starttime = :starttime WHERE starttime IS NULL AND valid = 1 AND judgetaskid IN (:ids)',
             [
                 'judgehostid' => $judgehost->getJudgehostid(),
@@ -1718,7 +1775,7 @@ private function serializeJudgeTasks(array $judgeTasks, Judgehost $judgehost): a
         if ($numUpdated == 0) {
             // Bad luck, some other judgehost beat us to it.
             return [];
-        }
+        }*/
 
         // We got at least one, let's update the starttime of the corresponding judging if haven't done so in the past.
         $starttime_set = $this->em->getConnection()->executeStatement(

webapp/src/Controller/Jury/SubmissionController.php

@@ -16,13 +16,14 @@
 use App\Entity\JudgingRun;
 use App\Entity\Language;
 use App\Entity\Problem;
+use App\Entity\QueueTask;
 use App\Entity\Submission;
 use App\Entity\SubmissionFile;
 use App\Entity\Team;
 use App\Entity\TeamAffiliation;
 use App\Entity\TeamCategory;
 use App\Entity\Testcase;
-use App\Entity\QueueTask;
+use App\Entity\Visualization;
 use App\Form\Type\SubmissionsFilterType;
 use App\Service\BalloonService;
 use App\Service\ConfigurationService;
@@ -513,6 +514,14 @@ public function viewAction(
                 ->getSingleScalarResult();
         }
 
+        $visualization = null;
+        $createdVisualization = $this->em->getRepository(Visualization::class)->findOneBy([
+                'judging' => $selectedJudging,
+                ]);
+        if ($createdVisualization) {
+            $visualization = ['url' => $this->generateUrl('jury_submission_visual', ['visualId' => $createdVisualization->getVisualizationId()])];
+        }
+
         $twigData = [
             'submission' => $submission,
             'lastSubmission' => $lastSubmission,
@@ -536,6 +545,7 @@ public function viewAction(
             'version_warnings' => [],
             'isMultiPassProblem' => $submission->getProblem()->isMultipassProblem(),
             'hasOutputVisualizer' => $submission->getProblem()->getOutputVisualizerExecutable() ?? false,
+            'visualization' => $visualization,
         ];
 
         if ($selectedJudging === null) {
@@ -1385,6 +1395,7 @@ protected function createVisualization(array $judgings): void
                           // We need to get the Judging_run first.
                           //->setJudgehost($judging->getJudgeTask()->getJudgehost())
                           ->setSubmission($submission)
+                          ->setTestcaseId($run->getTestcase()->getTestcaseId())
                           ->setPriority(JudgeTask::PRIORITY_LOW)
                           ->setOutputVisualizerScriptId($executable->getImmutableExecId())
                           ->setRunConfig($this->dj->jsonEncode(['hash' => $executable->getHash()]));
@@ -1417,4 +1428,18 @@ protected function createVisualization(array $judgings): void
             $this->addFlash('info', "Requested $numRequested to be visualized.");
         }
     }
+
+    #[Route(path: '/visual/{visualId}', name: 'jury_submission_visual')]
+    public function visualAction(
+        Request $request,
+        ?string $visualId = null,
+    ): StreamedResponse {
+        
+        dump($visualId);
+        $visualization = $this->em->getRepository(Visualization::class)->findOneBy(['visualization_id' => $visualId]);
+        dump($visualization, $visualId);
+        $name = 'visual.j' . $visualization->getJudging()->getJudgingid()
+            . '.png';
+        return Utils::streamAsBinaryFile(file_get_contents($visualization->getFilename()), $name);
+    }
 }