Use the original image to get landmarks and descriptors.

appinfo/info.xml

@@ -46,6 +46,7 @@
 	</repair-steps>
 	<commands>
 		<command>OCA\FaceRecognition\Command\BackgroundCommand</command>
+		<command>OCA\FaceRecognition\Command\MigrateCommand</command>
 		<command>OCA\FaceRecognition\Command\ProgressCommand</command>
 		<command>OCA\FaceRecognition\Command\ResetCommand</command>
 		<command>OCA\FaceRecognition\Command\SetupCommand</command>

lib/BackgroundJob/Tasks/ImageProcessingTask.php

@@ -136,25 +136,23 @@ public function execute(FaceRecognitionContext $context) {
 				}
 
 				// Get faces in the temporary image
-				$tempImagePath = $tempImage->getTempPath();
+				$tempImagePath = $tempImage->getResizedImagePath();
 				$rawFaces = $this->model->detectFaces($tempImagePath);
 
 				$this->logInfo('Faces found: ' . count($rawFaces));
 
 				$faces = array();
 				foreach ($rawFaces as $rawFace) {
-					// Get landmarks of face from model
-					$rawLandmarks = $this->model->detectLandmarks($tempImage->getTempPath(), $rawFace);
-					// Get descriptor of face from model
-					$descriptor = $this->model->computeDescriptor($tempImage->getTempPath(), $rawLandmarks);
-
-					// Normalize face and landmarks from model to original size
+					// Normalize face and get landmarks of face from model to original size
 					$normFace = $this->getNormalizedFace($rawFace, $tempImage->getRatio());
-					$normLandmarks = $this->getNormalizedLandmarks($rawLandmarks['parts'], $tempImage->getRatio());
+					$landmarks = $this->model->detectLandmarks($tempImage->getOrientedImagePath(), $normFace);
+
+					// Get descriptor of face from model
+					$descriptor = $this->model->computeDescriptor($tempImage->getOrientedImagePath(), $landmarks);
 
 					// Convert from dictionary of faces to our Face Db Entity and put Landmarks and descriptor
 					$face = Face::fromModel($image->getId(), $normFace);
-					$face->landmarks = $normLandmarks;
+					$face->landmarks = $landmarks['parts'];
 					$face->descriptor = $descriptor;
 
 					$faces[] = $face;
@@ -260,19 +258,4 @@ private function getNormalizedFace(array $rawFace, float $ratio): array {
 		return $face;
 	}
 
-	/**
-	 * Helper method, to normalize landmarks sizes back to original dimensions, based on ratio
-	 *
-	 */
-	private function getNormalizedLandmarks(array $rawLandmarks, float $ratio): array {
-		$landmarks = [];
-		foreach ($rawLandmarks as $rawLandmark) {
-			$landmark = [];
-			$landmark['x'] = intval(round($rawLandmark['x']*$ratio));
-			$landmark['y'] = intval(round($rawLandmark['y']*$ratio));
-			$landmarks[] = $landmark;
-		}
-		return $landmarks;
-	}
-
 }

lib/Command/MigrateCommand.php

@@ -0,0 +1,249 @@
+<?php
+/**
+ * @copyright Copyright (c) 2020, Matias De lellis <mati86dl@gmail.com>
+ * @copyright Copyright (c) 2019, Branko Kokanovic <branko@kokanovic.org>
+ *
+ * @author Branko Kokanovic <branko@kokanovic.org>
+ *
+ * @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 OCA\FaceRecognition\Command;
+
+use OCP\IUserManager;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+use Symfony\Component\Console\Helper\ProgressBar;
+
+use OCA\FaceRecognition\Db\Face;
+use OCA\FaceRecognition\Db\FaceMapper;
+
+use OCA\FaceRecognition\Db\Image;
+use OCA\FaceRecognition\Db\ImageMapper;
+
+use OCA\FaceRecognition\Model\ModelManager;
+
+use OCA\FaceRecognition\Service\FaceManagementService;
+use OCA\FaceRecognition\Service\FileService;
+
+use OCP\Image as OCP_Image;
+
+class MigrateCommand extends Command {
+
+	/** @var FaceManagementService */
+	protected $faceManagementService;
+
+	/** @var FileService */
+	protected $fileService;
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var ModelManager */
+	protected $modelManager;
+
+	/** @var FaceMapper */
+	protected $faceMapper;
+
+	/** @var ImageMapper Image mapper*/
+	protected $imageMapper;
+
+	/**
+	 * @param FaceManagementService $faceManagementService
+	 * @param IUserManager $userManager
+	 */
+	public function __construct(FaceManagementService $faceManagementService,
+	                            FileService           $fileService,
+	                            IUserManager          $userManager,
+	                            ModelManager          $modelManager,
+	                            FaceMapper            $faceMapper,
+	                            ImageMapper           $imageMapper)
+	{
+		parent::__construct();
+
+		$this->faceManagementService = $faceManagementService;
+		$this->fileService           = $fileService;
+		$this->userManager           = $userManager;
+		$this->modelManager          = $modelManager;
+		$this->faceMapper            = $faceMapper;
+		$this->imageMapper           = $imageMapper;
+	}
+
+	protected function configure() {
+		$this
+			->setName('face:migrate')
+			->setDescription(
+				'Migrate the faces found in a model and analyze with the current model.')
+			->addOption(
+				'model',
+				'm',
+				InputOption::VALUE_REQUIRED,
+				'The identifier number of the model to migrate',
+				null,
+			)
+			->addOption(
+				'user_id',
+				'u',
+				InputOption::VALUE_REQUIRED,
+				'Migrate data for a given user only. If not given, migrate everything for all users.',
+				null,
+			);
+	}
+
+	/**
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 * @return int
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		// Extract user, if any
+		//
+		$userId = $input->getOption('user_id');
+		if ($userId === null) {
+			$output->writeln("You must specify the user to migrate");
+			return 1;
+		}
+
+		$user = $this->userManager->get($userId);
+		if ($user === null) {
+			$output->writeln("User with id <$userId> is unknown.");
+			return 1;
+		}
+
+		$modelId = $input->getOption('model');
+		if (is_null($modelId)) {
+			$output->writeln("You must indicate the ID of the model to migrate");
+			return 1;
+		}
+
+		$model = $this->modelManager->getModel($modelId);
+		if (is_null($model)) {
+			$output->writeln("Invalid model Id");
+			return 1;
+		}
+
+		if (!$model->isInstalled()) {
+			$output->writeln("The model <$modelId> is not installed");
+			return 1;
+		}
+
+		$currentModel = $this->modelManager->getCurrentModel();
+		$currentModelId = (!is_null($currentModel)) ? $currentModel->getId() : -1;
+
+		if ($currentModelId === $modelId) {
+			$output->writeln("The proposed model <$modelId> to migrate must be other than the current one <$currentModelId>");
+			return 1;
+		}
+
+		if (!$this->faceManagementService->hasDataForUser($userId, $modelId)) {
+			$output->writeln("The proposed model <$modelId> to migrate is empty");
+			return 1;
+		}
+
+		if ($this->faceManagementService->hasDataForUser($userId, $currentModelId)) {
+			$output->writeln("The current model <$currentModelId> already has data. You cannot migrate to a used model.");
+			return 1;
+		}
+
+		/**
+		 * MIgrate
+		 */
+		$currentModel->open();
+
+		$oldImages = $this->imageMapper->findAll($userId, $modelId);
+
+		$progressBar = new ProgressBar($output, count($oldImages));
+		$progressBar->start();
+
+		foreach ($oldImages as $oldImage) {
+			$newImage = $this->migrateImage($oldImage, $userId, $currentModelId);
+			$oldFaces = $this->faceMapper->findFromFile($userId, $modelId, $newImage->getFile());
+			if (count($oldFaces) > 0) {
+				$filePath = $this->getImageFilePath($newImage);
+				foreach ($oldFaces as $oldFace) {
+					$this->migrateFace($currentModel, $oldFace, $newImage, $filePath);
+				}
+				$this->fileService->clean();
+			}
+			$progressBar->advance(1);
+		}
+
+		$progressBar->finish();
+	}
+
+	private function migrateImage($oldImage, $userId, $modelId): Image {
+		$image = new Image();
+
+		$image->setUser($userId);
+		$image->setFile($oldImage->getFile());
+		$image->setModel($modelId);
+		$image->setIsProcessed($oldImage->getIsProcessed());
+		$image->setError($oldImage->getError());
+		$image->setLastProcessedTime($oldImage->getLastProcessedTime());
+		$image->setProcessingDuration($oldImage->getProcessingDuration());
+
+		return $this->imageMapper->insert($image);
+	}
+
+	private function migrateFace($model, $oldFace, $image, $filePath) {
+		$faceRect = $this->getFaceRect($oldFace);
+
+		$face = Face::fromModel($image->getId(), $faceRect);
+
+		$landmarks = $model->detectLandmarks($filePath, $faceRect);
+		$descriptor = $model->computeDescriptor($filePath, $landmarks);
+
+		$face->landmarks = $landmarks['parts'];
+		$face->descriptor = $descriptor;
+
+		$this->faceMapper->insertFace($face);
+	}
+
+	private function getImageFilePath(Image $image): ?string {
+		$file = $this->fileService->getFileById($image->getFile(), $image->getUser());
+		if (empty($file)) {
+			return null;
+		}
+
+		$localPath = $this->fileService->getLocalFile($file);
+
+		$image = new OCP_Image();
+		$image->loadFromFile($localPath);
+		if ($image->getOrientation() > 1) {
+			$tempPath = $this->fileService->getTemporaryFile();
+			$image->fixOrientation();
+			$image->save($tempPath, 'image/png');
+			return $tempPath;
+		}
+
+		return $localPath;
+	}
+
+	private function getFaceRect(Face $face): array {
+		$rect = [];
+		$rect['left'] = (int)$face->getLeft();
+		$rect['right'] = (int)$face->getRight();
+		$rect['top'] =  (int)$face->getTop();
+		$rect['bottom'] = (int)$face->getBottom();
+		$rect['detection_confidence'] = $face->getConfidence();
+		return $rect;
+	}
+
+}

lib/Command/ResetCommand.php

@@ -72,6 +72,13 @@ protected function configure() {
 				'Reset everything.',
 				null
 			)
+			->addOption(
+				'model',
+				null,
+				InputOption::VALUE_NONE,
+				'Reset current model.',
+				null
+			)
 			->addOption(
 				'image-errors',
 				null,
@@ -114,6 +121,11 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			$output->writeln('Reset successfully done');
 			return 0;
 		}
+		else if ($input->getOption('model')) {
+			$this->resetModel($user);
+			$output->writeln('Reset model successfully done');
+			return 0;
+		}
 		else if ($input->getOption('image-errors')) {
 			$this->resetImageErrors($user);
 			$output->writeln('Reset image errors done');
@@ -142,4 +154,8 @@ private function resetAll($user) {
 		$this->faceManagementService->resetAll($user);
 	}
 
+	private function resetModel($user) {
+		$this->faceManagementService->resetModel($user);
+	}
+
 }

lib/Db/FaceMapper.php

@@ -57,7 +57,7 @@ public function find (int $faceId) {
 	 */
 	public function findFromFile(string $userId, int $modelId, int $fileId): array {
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('f.id', 'left', 'right', 'top', 'bottom', 'person')
+		$qb->select('f.id', 'left', 'right', 'top', 'bottom', 'person', 'confidence', 'creation_time')
 			->from($this->getTableName(), 'f')
 			->innerJoin('f', 'facerecog_images' ,'i', $qb->expr()->eq('f.image', 'i.id'))
 			->where($qb->expr()->eq('i.user', $qb->createParameter('user_id')))
@@ -204,6 +204,28 @@ public function deleteUserFaces(string $userId) {
 			->execute();
 	}
 
+	/**
+	 * Deletes all faces from that user and model
+	 *
+	 * @param string $userId User to drop faces from table.
+	 * @param int $modelId model to drop faces from table.
+	 */
+	public function deleteUserModel(string $userId, $modelId) {
+		$sub = $this->db->getQueryBuilder();
+		$sub->select(new Literal('1'));
+		$sub->from('facerecog_images', 'i')
+			->where($sub->expr()->eq('i.id', '*PREFIX*' . $this->getTableName() .'.image'))
+			->andWhere($sub->expr()->eq('i.user', $sub->createParameter('user')))
+			->andWhere($sub->expr()->eq('i.model', $sub->createParameter('model')));
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->delete($this->getTableName())
+			->where('EXISTS (' . $sub->getSQL() . ')')
+			->setParameter('user', $userId)
+			->setParameter('model', $modelId)
+			->execute();
+	}
+
 	/**
 	 * Unset relation beetwen faces and persons from that user in order to reset clustering
 	 *