Merge branch 'master' into PS-907-fixes

Author: 4rthem

databox/api/src/Api/Model/Input/Attribute/AbstractExtendedAttributeInput.php

@@ -4,6 +4,9 @@
 
 namespace App\Api\Model\Input\Attribute;
 
+use App\Entity\Traits\AssetAnnotationsInterface;
+use Symfony\Component\Validator\Constraints as Assert;
+
 abstract class AbstractExtendedAttributeInput extends AbstractBaseAttributeInput
 {
     /**
@@ -22,6 +25,12 @@ abstract class AbstractExtendedAttributeInput extends AbstractBaseAttributeInput
     /**
      * @var array
      */
+    #[Assert\Collection(
+        fields: [
+            'type' => new Assert\Choice(AssetAnnotationsInterface::TYPES),
+        ],
+        allowExtraFields: true,
+    )]
     public $annotations;
 
     /**

databox/api/src/Attribute/BatchAttributeManager.php

@@ -204,6 +204,7 @@ public function handleBatch(
                                 'ids' => $action->ids,
                                 'origin' => $action->origin,
                                 'originVendor' => $action->originVendor,
+                                'originVendorContext' => $action->originVendorContext,
                             ]);
                             break;
                         case self::ACTION_SET:
@@ -469,6 +470,11 @@ private function deleteAttributes(
                 ->andWhere('a.originVendor = :originVendor')
                 ->setParameter('originVendor', $options['originVendor']);
         }
+        if ($options['originVendorContext'] ?? null) {
+            $qb
+                ->andWhere('a.originVendorContext = :ovc')
+                ->setParameter('ovc', $options['originVendorContext']);
+        }
         $qb->getQuery()->execute();
     }
 

databox/api/src/Entity/Traits/AssetAnnotationsInterface.php

@@ -10,7 +10,7 @@ interface AssetAnnotationsInterface
     // "x", "y", "r" (radius in %), "c"? (border color in hexa), "f"? (fill color in hexa)
     final public const string TYPE_CIRCLE = 'circle';
 
-    // "x1", "y1", "x2", "y2", "c"? (border color in hexa), "f"? (fill color in hexa)
+    // "x", "y", "w", "h", "c"? (border color in hexa), "f"? (fill color in hexa)
     final public const string TYPE_RECTANGLE = 'rect';
 
     // "t" (time: float in seconds)

databox/api/src/Integration/Aws/Rekognition/RekognitionAnalyzer.php

@@ -12,6 +12,7 @@
 use App\Entity\Core\Asset;
 use App\Entity\Core\Attribute;
 use App\Entity\Core\File;
+use App\Entity\Traits\AssetAnnotationsInterface;
 use App\Integration\ApiBudgetLimiter;
 use App\Integration\IntegrationConfig;
 use App\Integration\IntegrationDataManager;
@@ -51,22 +52,40 @@ public function analyze(?Asset $asset, File $file, string $category, Integration
 
         if (!empty($result) && $asset instanceof Asset) {
             if (AwsRekognitionIntegration::LABELS === $category && !empty($config['labels']['attributes'] ?? [])) {
-                $this->saveTextsToAttributes($asset, array_map(fn (array $text): array => [
+                $this->saveTextsToAttributes($category, $asset, array_map(fn (array $text): array => [
                     'value' => $text['Name'],
-                    'confidence' => $text['Confidence'],
+                    'confidence' => $text['Confidence'] / 100,
+                    'annotations' => array_map(fn (array $instance): array => [
+                        'type' => AssetAnnotationsInterface::TYPE_RECTANGLE,
+                        'x' => $instance['BoundingBox']['Left'] ?? null,
+                        'y' => $instance['BoundingBox']['Top'] ?? null,
+                        'w' => $instance['BoundingBox']['Width'] ?? null,
+                        'h' => $instance['BoundingBox']['Height'] ?? null,
+                    ], $text['Instances'] ?? []),
                 ], $result['Labels']), $config['labels']['attributes']);
             } elseif (AwsRekognitionIntegration::TEXTS === $category && !empty($config['texts']['attributes'] ?? [])) {
-                $this->saveTextsToAttributes($asset, array_map(fn (array $text): array => [
-                    'value' => $text['DetectedText'],
-                    'confidence' => $text['Confidence'],
-                ], array_filter($result['TextDetections'], fn (array $text): bool => 'LINE' === $text['Type'])), $config['texts']['attributes']);
+                $this->saveTextsToAttributes($category, $asset, array_map(function (array $text): array {
+                    $box = $text['Geometry']['BoundingBox'] ?? [];
+
+                    return [
+                        'value' => $text['DetectedText'],
+                        'confidence' => $text['Confidence'] / 100,
+                        'annotations' => [[
+                            'type' => AssetAnnotationsInterface::TYPE_RECTANGLE,
+                            'x' => $box['Left'] ?? null,
+                            'y' => $box['Top'] ?? null,
+                            'w' => $box['Width'] ?? null,
+                            'h' => $box['Height'] ?? null,
+                        ]],
+                    ];
+                }, array_filter($result['TextDetections'], fn (array $text): bool => 'LINE' === $text['Type'])), $config['texts']['attributes']);
             }
         }
 
         return $result;
     }
 
-    protected function saveTextsToAttributes(Asset $asset, array $texts, array $attributes): void
+    protected function saveTextsToAttributes(string $category, Asset $asset, array $texts, array $attributes): void
     {
         foreach ($attributes as $attrConfig) {
             $attrDef = $this->attributeManager
@@ -84,17 +103,20 @@ protected function saveTextsToAttributes(Asset $asset, array $texts, array $attr
             $i->action = BatchAttributeManager::ACTION_DELETE;
             $i->origin = Attribute::ORIGIN_MACHINE;
             $i->originVendor = AwsRekognitionIntegration::getName();
+            $i->originVendorContext = $category;
             $input->actions[] = $i;
 
             foreach ($texts as $text) {
-                if (null === $threshold || $threshold < $text['confidence']) {
+                if (null === $threshold || $text['confidence'] >= $threshold) {
                     $i = new AttributeActionInput();
                     $i->action = BatchAttributeManager::ACTION_ADD;
                     $i->originVendor = AwsRekognitionIntegration::getName();
+                    $i->originVendorContext = $category;
                     $i->origin = Attribute::ORIGIN_MACHINE;
                     $i->definitionId = $attrDef->getId();
                     $i->confidence = $text['confidence'];
                     $i->value = $text['value'];
+                    $i->annotations = $text['annotations'] ?? [];
                     $input->actions[] = $i;
                 }
             }