chore: Maintenance

.github/workflows/cluster-faces-test.yml

@@ -161,8 +161,10 @@ jobs:
 
       - name: Set config
         run: |
-          ./occ config:app:set --value ${{ matrix.pure-js-mode }} recognize tensorflow.purejs
+          ./occ config:app:set --lazy --value ${{ matrix.pure-js-mode }} recognize tensorflow.purejs
           ./occ config:app:set --value true recognize faces.enabled
+          # Don't force API key usage to allow tests to run
+          ./occ config:app:set --value false recognize require_api_key
           # only use one core. GH actions has 2
           ./occ config:app:set --value 1 recognize tensorflow.cores
 

.github/workflows/files-scan-test.yml

@@ -133,7 +133,7 @@ jobs:
       - name: Set imagenet.enabled and concurrency.enabled
         run: |
           ./occ config:app:set --value true recognize imagenet.enabled
-          ./occ config:app:set --value true recognize concurrency.enabled
+          ./occ config:app:set --lazy --value true recognize concurrency.enabled
 
       - name: Run scan
         env:

.github/workflows/full-run-test.yml

@@ -155,7 +155,7 @@ jobs:
 
       - name: Set pure-js mode
         run: |
-          ./occ config:app:set --value ${{ matrix.pure-js-mode }} recognize tensorflow.purejs
+          ./occ config:app:set --lazy --value ${{ matrix.pure-js-mode }} recognize tensorflow.purejs
 
       - name: Set imagenet.enabled
         run: |

appinfo/info.xml

@@ -75,7 +75,7 @@ Requirements:
 The app does not send any sensitive data to cloud providers or similar services. All processing is done on your Nextcloud machine, using Tensorflow.js running in Node.js.
 
 ]]></description>
-	<version>11.1.0-dev.0</version>
+	<version>12.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author mail="mklehr@gmx.net">Marcel Klehr</author>
 	<types>
@@ -92,7 +92,7 @@ The app does not send any sensitive data to cloud providers or similar services.
 	<screenshot>https://raw.githubusercontent.com/nextcloud/recognize/main/screenshots/Logo.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/recognize/main/screenshots/imagenet_examples.jpg</screenshot>
 	<dependencies>
-		<nextcloud min-version="33" max-version="34" />
+		<nextcloud min-version="34" max-version="34" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Recognize\BackgroundJobs\MaintenanceJob</job>

composer.json

@@ -1,47 +1,51 @@
 {
-    "require": {
-        "php": ">=8.2",
-        "ext-json": "*",
-        "ext-pdo": "*",
-        "rubix/ml": "2.x",
-        "amphp\/parallel": "1.4.x",
-        "wamania/php-stemmer": "4.0 as 3.0",
-        "bamarni/composer-bin-plugin": "^1.8"
-    },
-    "autoload": {
-        "psr-4": {
-            "OCA\\Recognize\\": "lib/"
-        }
+  "require": {
+    "php": ">=8.2",
+    "ext-json": "*",
+    "ext-pdo": "*",
+    "rubix/ml": "2.x",
+    "amphp/parallel": "1.4.x",
+    "wamania/php-stemmer": "4.0 as 3.0",
+    "bamarni/composer-bin-plugin": "^1.8"
+  },
+  "autoload": {
+    "psr-4": {
+      "OCA\\Recognize\\": "lib/"
+    }
+  },
+  "scripts": {
+    "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
+    "cs:check": "php-cs-fixer fix --dry-run --diff",
+    "cs:fix": "php-cs-fixer fix",
+    "psalm": "psalm",
+    "psalm:update-baseline": "psalm --threads=1 --update-baseline",
+    "psalm:update-baseline:force": "psalm --threads=1 --update-baseline --set-baseline=psalm-baseline.xml",
+    "test:unit": "phpunit --config tests/phpunit.xml",
+    "post-install-cmd": [
+      "@composer bin all install --ansi",
+      "grep -r 'OCA\\\\Recognize\\\\Vendor\\\\Rubix' ./vendor/rubix/ml/ || vendor/bin/php-scoper add-prefix --prefix='OCA\\Recognize\\Vendor' --output-dir=\".\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\"",
+      "composer install --no-scripts",
+      "@composer bin all install --ansi",
+      "composer dump-autoload"
+    ],
+    "post-update-cmd": [
+      "@composer bin all update --ansi",
+      "grep -r 'OCA\\\\Recognize\\\\Vendor\\\\Rubix' ./vendor/rubix/ml/ || vendor/bin/php-scoper add-prefix --prefix='OCA\\Recognize\\Vendor' --output-dir=\".\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\"",
+      "composer install --no-scripts",
+      "@composer bin all update --ansi",
+      "composer dump-autoload"
+    ]
+  },
+  "config": {
+    "platform": {
+      "php": "8.2.0"
     },
-    "scripts": {
-        "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
-        "cs:check": "php-cs-fixer fix --dry-run --diff",
-        "cs:fix": "php-cs-fixer fix",
-        "psalm": "psalm",
-        "psalm:update-baseline": "psalm --threads=1 --update-baseline",
-        "psalm:update-baseline:force": "psalm --threads=1 --update-baseline --set-baseline=psalm-baseline.xml",
-        "test:unit": "phpunit --config tests/phpunit.xml",
-        "post-install-cmd": [
-            "@composer bin all install --ansi",
-            "grep -r 'OCA\\\\Recognize\\\\Vendor\\\\Rubix' ./vendor/rubix/ml/ || vendor/bin/php-scoper add-prefix --prefix='OCA\\Recognize\\Vendor' --output-dir=\".\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\"",
-            "composer dump-autoload"
-        ],
-        "post-update-cmd": [
-            "@composer bin all update --ansi",
-            "grep -r 'OCA\\\\Recognize\\\\Vendor\\\\Rubix' ./vendor/rubix/ml/ || vendor/bin/php-scoper add-prefix --prefix='OCA\\Recognize\\Vendor' --output-dir=\".\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\"",
-            "composer dump-autoload"
-        ]
+    "allow-plugins": {
+      "bamarni/composer-bin-plugin": true,
+      "composer/package-versions-deprecated": true
     },
-    "config": {
-        "platform": {
-            "php": "8.2.0"
-        },
-        "allow-plugins": {
-            "bamarni/composer-bin-plugin": true,
-            "composer/package-versions-deprecated": true
-        },
-        "autoloader-suffix": "Recognize",
-        "optimize-autoloader": true,
-        "sort-packages": true
-    }
+    "autoloader-suffix": "Recognize",
+    "optimize-autoloader": true,
+    "sort-packages": true
+  }
 }

lib/BackgroundJobs/StorageCrawlJob.php

@@ -78,7 +78,7 @@ protected function run($argument): void {
 						$this->queue->insertIntoQueue(ImagenetClassifier::MODEL_NAME, $queueFile);
 					}
 					if (!in_array(ImagenetClassifier::MODEL_NAME, $models) && in_array(LandmarksClassifier::MODEL_NAME, $models)) {
-						$tags = $this->tagManager->getTagsForFiles([$queueFile->getFileId()]);
+						$tags = $this->tagManager->getTagsForFiles([(string)$queueFile->getFileId()]);
 						$fileTags = $tags[$queueFile->getFileId()];
 						$landmarkTags = array_filter($fileTags, function ($tag) {
 							return in_array($tag->getName(), LandmarksClassifier::PRECONDITION_TAGS);

lib/Classifiers/Audio/MusicnnClassifier.php

@@ -31,7 +31,7 @@ public function __construct(Logger $logger, IAppConfig $config, TagManager $tagM
 
 	#[Override]
 	public function classify(array $queueFiles): void {
-		if ($this->config->getAppValueString('tensorflow.purejs', 'false') === 'true') {
+		if ($this->config->getAppValueString('tensorflow.purejs', 'false', lazy: true) === 'true') {
 			$timeout = self::AUDIO_PUREJS_TIMEOUT;
 		} else {
 			$timeout = self::AUDIO_TIMEOUT;
@@ -43,8 +43,8 @@ public function classify(array $queueFiles): void {
 		 */
 		foreach ($classifierProcess as $queueFile => $results) {
 			$this->tagManager->assignTags($queueFile->getFileId(), $results);
-			$this->config->setAppValueString(self::MODEL_NAME.'.status', 'true');
-			$this->config->setAppValueString(self::MODEL_NAME.'.lastFile', (string)time());
+			$this->config->setAppValueString(self::MODEL_NAME.'.status', 'true', lazy: true);
+			$this->config->setAppValueString(self::MODEL_NAME.'.lastFile', (string)time(), lazy: true);
 		}
 	}
 }

lib/Classifiers/Classifier.php

@@ -159,15 +159,15 @@ public function classifyFiles(string $model, array $queueFiles, int $timeout): \
 		$this->logger->debug('Classifying '.var_export($paths, true));
 
 		$command = [
-			$this->config->getAppValueString('node_binary'),
+			$this->config->getAppValueString('node_binary', lazy: true),
 			dirname(__DIR__, 2) . '/src/classifier_'.$model.'.js',
 			'-'
 		];
 
-		if (trim($this->config->getAppValueString('nice_binary', '')) !== '') {
+		if (trim($this->config->getAppValueString('nice_binary', '', lazy: true)) !== '') {
 			$command = [
-				$this->config->getAppValueString('nice_binary'),
-				"-" . $this->config->getAppValueString('nice_value', '0'),
+				$this->config->getAppValueString('nice_binary', lazy: true),
+				"-" . $this->config->getAppValueString('nice_value', '0', lazy: true),
 				...$command,
 			];
 		}
@@ -179,7 +179,7 @@ public function classifyFiles(string $model, array $queueFiles, int $timeout): \
 		if ($this->config->getAppValueString('tensorflow.gpu', 'false') === 'true') {
 			$env['RECOGNIZE_GPU'] = 'true';
 		}
-		if ($this->config->getAppValueString('tensorflow.purejs', 'false') === 'true') {
+		if ($this->config->getAppValueString('tensorflow.purejs', 'false', lazy: true) === 'true') {
 			$env['RECOGNIZE_PUREJS'] = 'true';
 		}
 		// Set cores

lib/Classifiers/Images/ClusteringFaceClassifier.php

@@ -64,7 +64,7 @@ private function getUsersWithFileAccess(Node $node): array {
 
 	#[Override]
 	public function classify(array $queueFiles): void {
-		if ($this->config->getAppValueString('tensorflow.purejs', 'false') === 'true') {
+		if ($this->config->getAppValueString('tensorflow.purejs', 'false', lazy: true) === 'true') {
 			$timeout = self::IMAGE_PUREJS_TIMEOUT;
 		} else {
 			$timeout = self::IMAGE_TIMEOUT;
@@ -134,8 +134,8 @@ public function classify(array $queueFiles): void {
 					$this->logger->debug('scheduling ClusterFacesJob for user ' . $userId);
 					$this->jobList->add(ClusterFacesJob::class, ['userId' => $userId]);
 				}
-				$this->config->setAppValueString(self::MODEL_NAME . '.status', 'true');
-				$this->config->setAppValueString(self::MODEL_NAME . '.lastFile', (string)time());
+				$this->config->setAppValueString(self::MODEL_NAME . '.status', 'true', lazy: true);
+				$this->config->setAppValueString(self::MODEL_NAME . '.lastFile', (string)time(), lazy: true);
 			}
 		}
 		$this->logger->debug('face classifier end');

lib/Classifiers/Images/ImagenetClassifier.php

@@ -33,7 +33,7 @@ public function __construct(Logger $logger, IAppConfig $config, TagManager $tagM
 
 	#[Override]
 	public function classify(array $queueFiles): void {
-		if ($this->config->getAppValueString('tensorflow.purejs', 'false') === 'true') {
+		if ($this->config->getAppValueString('tensorflow.purejs', 'false', lazy: true) === 'true') {
 			$timeout = self::IMAGE_PUREJS_TIMEOUT;
 		} else {
 			$timeout = self::IMAGE_TIMEOUT;
@@ -47,8 +47,8 @@ public function classify(array $queueFiles): void {
 			$landmarkTags = array_filter($results, static function ($tagName) {
 				return in_array($tagName, LandmarksClassifier::PRECONDITION_TAGS);
 			});
-			$this->config->setAppValueString(self::MODEL_NAME.'.status', 'true');
-			$this->config->setAppValueString(self::MODEL_NAME.'.lastFile', (string)time());
+			$this->config->setAppValueString(self::MODEL_NAME.'.status', 'true', lazy: true);
+			$this->config->setAppValueString(self::MODEL_NAME.'.lastFile', (string)time(), lazy: true);
 
 			if (count($landmarkTags) > 0) {
 				try {

lib/Classifiers/Images/LandmarksClassifier.php

@@ -33,7 +33,7 @@ public function __construct(Logger $logger, IAppConfig $config, TagManager $tagM
 
 	#[Override]
 	public function classify(array $queueFiles): void {
-		if ($this->config->getAppValueString('tensorflow.purejs', 'false') === 'true') {
+		if ($this->config->getAppValueString('tensorflow.purejs', 'false', lazy: true) === 'true') {
 			$timeout = self::IMAGE_PUREJS_TIMEOUT;
 		} else {
 			$timeout = self::IMAGE_TIMEOUT;
@@ -44,8 +44,8 @@ public function classify(array $queueFiles): void {
 		/** @var list<string> $results */
 		foreach ($classifierProcess as $queueFile => $results) {
 			$this->tagManager->assignTags($queueFile->getFileId(), $results);
-			$this->config->setAppValueString(self::MODEL_NAME.'.status', 'true');
-			$this->config->setAppValueString(self::MODEL_NAME.'.lastFile', (string)time());
+			$this->config->setAppValueString(self::MODEL_NAME.'.status', 'true', lazy: true);
+			$this->config->setAppValueString(self::MODEL_NAME.'.lastFile', (string)time(), lazy: true);
 		}
 	}
 }

lib/Classifiers/Video/MovinetClassifier.php

@@ -31,7 +31,7 @@ public function __construct(Logger $logger, IAppConfig $config, TagManager $tagM
 
 	#[Override]
 	public function classify(array $queueFiles): void {
-		if ($this->config->getAppValueString('tensorflow.purejs', 'false') === 'true') {
+		if ($this->config->getAppValueString('tensorflow.purejs', 'false', lazy: true) === 'true') {
 			throw new Exception('Movinet does not support WASM mode');
 		} else {
 			$timeout = self::VIDEO_TIMEOUT;
@@ -42,8 +42,8 @@ public function classify(array $queueFiles): void {
 		/** @var list<string> $results */
 		foreach ($classifierProcess as $queueFile => $results) {
 			$this->tagManager->assignTags($queueFile->getFileId(), $results);
-			$this->config->setAppValueString(self::MODEL_NAME.'.status', 'true');
-			$this->config->setAppValueString(self::MODEL_NAME.'.lastFile', (string)time());
+			$this->config->setAppValueString(self::MODEL_NAME.'.status', 'true', lazy: true);
+			$this->config->setAppValueString(self::MODEL_NAME.'.lastFile', (string)time(), lazy: true);
 		}
 	}
 }

lib/Command/Classify.php

@@ -123,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					}
 					// if retry flag is set, skip other classifiers for tagged files
 					if ($input->getOption('retry')) {
-						$fileTags = $this->tagManager->getTagsForFiles([$lastFileId]);
+						$fileTags = $this->tagManager->getTagsForFiles([(string)$lastFileId]);
 						// check if processed tag is already in the tags
 						if (in_array($processedTag, $fileTags[$lastFileId])) {
 							continue;

lib/Controller/AdminController.php

@@ -177,17 +177,17 @@ public function musl(): JSONResponse {
 
 	public function nice(): JSONResponse {
 		/* use nice binary from settings if available */
-		if ($this->config->getAppValueString('nice_binary', '') !== '') {
-			$nice_path = $this->config->getAppValueString('nice_binary');
+		if ($this->config->getAppValueString('nice_binary', '', lazy: true) !== '') {
+			$nice_path = $this->config->getAppValueString('nice_binary', lazy: true);
 		} else {
 			/* returns the path to the nice binary or false if not found */
 			$nice_path = $this->binaryFinder->findBinaryPath('nice');
 		}
 
 		if ($nice_path !== false) {
-			$this->config->setAppValueString('nice_binary', $nice_path);
+			$this->config->setAppValueString('nice_binary', $nice_path, lazy: true);
 		} else {
-			$this->config->setAppValueString('nice_binary', '');
+			$this->config->setAppValueString('nice_binary', '', lazy: true);
 			return new JSONResponse(['nice' => false]);
 		}
 

lib/Dav/Faces/FacePhoto.php

@@ -123,6 +123,9 @@ public function hasPreview(): bool {
 
 	public function isFavorite(): bool {
 		$tagger = $this->tagManager->load('files');
+		if ($tagger === null) {
+			return false;
+		}
 		$tags = $tagger->getTagsForObjects([$this->getFile()->getId()]);
 
 		if ($tags === false || empty($tags)) {

lib/Dav/Faces/PropFindPlugin.php

@@ -15,6 +15,7 @@
 use OCA\Recognize\Db\FaceDetectionWithTitle;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\AppFramework\Services\IAppConfig;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\DB\Exception;
 use OCP\Files\DavUtil;
@@ -47,6 +48,7 @@ public function __construct(
 		private ICrypto $crypto,
 		private LoggerInterface $logger,
 		private ITimeFactory $timeFactory,
+		private IAppConfig $appConfig,
 	) {
 	}
 
@@ -76,12 +78,12 @@ public function propFind(PropFind $propFind, INode $node): void {
 			$propFind->handle(TagsPlugin::FAVORITE_PROPERTYNAME, fn () => $node->isFavorite() ? 1 : 0);
 			$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, fn () => json_encode($this->previewManager->isAvailable($node->getFile()->getFileInfo())));
 			$propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function () use ($node): string {
-				$permissions = DavUtil::getDavPermissions($node->getFile()->getFileInfo());
+				$permissions = DavUtil::getDavPermissions($node->getFile(), $node->getFile()->getParent());
 				$filteredPermissions = str_replace('R', '', $permissions);
 				return $filteredPermissions;
 			});
 
-			foreach ($node->getFile()->getFileInfo()->getMetadata() as $metadataKey => $metadataValue) {
+			foreach ($node->getFile()->getMetadata() as $metadataKey => $metadataValue) {
 				/** @var string $metadataKey */
 				$propFind->handle(FilesPlugin::FILE_METADATA_PREFIX.$metadataKey, $metadataValue);
 			}
@@ -130,6 +132,9 @@ public function beforeMethod(RequestInterface $request, ResponseInterface $respo
 		if (!str_starts_with($request->getPath(), 'recognize')) {
 			return;
 		}
+		if ($this->appConfig->getAppValueString('require_api_key', 'true') !== 'true') {
+			return;
+		}
 		$key = $request->getHeader('X-Recognize-Api-Key');
 		if ($key === null) {
 			throw new Forbidden('You must provide a valid X-Recognize-Api-Key');