People: Add embeddings blacklist to reduce false positives #22

photoprism · Sep 30, 2021 · 582a330 · 582a330
1 parent c7ff0f1
commit 582a330
Show file tree

Hide file tree

Showing 36 changed files with 910 additions and 337 deletions.
diff --git a/frontend/src/dialog/photo/people.vue b/frontend/src/dialog/photo/people.vue
@@ -133,19 +133,31 @@ export default {
     },
     onReject(marker) {
       this.busy = true;
-      marker.reject().finally(() => this.busy = false);
+      this.$notify.blockUI();
+      marker.reject().finally(() => {
+        this.$notify.unblockUI();
+        this.busy = false;
+      });
     },
     onApprove(marker) {
       this.busy = true;
       marker.approve().finally(() => this.busy = false);
     },
     onClearSubject(marker) {
       this.busy = true;
-      marker.clearSubject(marker).finally(() => this.busy = false);
+      this.$notify.blockUI();
+      marker.clearSubject(marker).finally(() => {
+        this.$notify.unblockUI();
+        this.busy = false;
+      });
     },
     onRename(marker) {
       this.busy = true;
-      marker.rename().finally(() => this.busy = false);
+      this.$notify.blockUI();
+      marker.rename().finally(() => {
+        this.$notify.unblockUI();
+        this.busy = false;
+      });
     },
   },
 };

diff --git a/internal/entity/embedding.go b/internal/entity/embedding.go
diff --git a/internal/entity/embedding_test.go b/internal/entity/embedding_test.go
diff --git a/internal/entity/face.go b/internal/entity/face.go
@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/photoprism/photoprism/internal/face"
-	"github.com/photoprism/photoprism/pkg/clusters"
 	"github.com/photoprism/photoprism/pkg/rnd"
 )
 
@@ -27,7 +26,7 @@ type Face struct {
 	Collisions      int             `json:"Collisions" yaml:"Collisions,omitempty"`
 	CollisionRadius float64         `json:"CollisionRadius" yaml:"CollisionRadius,omitempty"`
 	EmbeddingJSON   json.RawMessage `gorm:"type:MEDIUMBLOB;" json:"-" yaml:"EmbeddingJSON,omitempty"`
-	embedding       Embedding       `gorm:"-"`
+	embedding       face.Embedding  `gorm:"-"`
 	MatchedAt       *time.Time      `json:"MatchedAt" yaml:"MatchedAt,omitempty"`
 	CreatedAt       time.Time       `json:"CreatedAt" yaml:"CreatedAt,omitempty"`
 	UpdatedAt       time.Time       `json:"UpdatedAt" yaml:"UpdatedAt,omitempty"`
@@ -42,7 +41,7 @@ func (Face) TableName() string {
 }
 
 // NewFace returns a new face.
-func NewFace(subjUID, faceSrc string, embeddings Embeddings) *Face {
+func NewFace(subjUID, faceSrc string, embeddings face.Embeddings) *Face {
 	result := &Face{
 		SubjUID: subjUID,
 		FaceSrc: faceSrc,
@@ -56,8 +55,8 @@ func NewFace(subjUID, faceSrc string, embeddings Embeddings) *Face {
 }
 
 // SetEmbeddings assigns face embeddings.
-func (m *Face) SetEmbeddings(embeddings Embeddings) (err error) {
-	m.embedding, m.SampleRadius, m.Samples = EmbeddingsMidpoint(embeddings)
+func (m *Face) SetEmbeddings(embeddings face.Embeddings) (err error) {
+	m.embedding, m.SampleRadius, m.Samples = face.EmbeddingsMidpoint(embeddings)
 
 	// Limit sample radius to reduce false positives.
 	if m.SampleRadius > 0.35 {
@@ -91,9 +90,9 @@ func (m *Face) Matched() error {
 }
 
 // Embedding returns parsed face embedding.
-func (m *Face) Embedding() Embedding {
+func (m *Face) Embedding() face.Embedding {
 	if len(m.EmbeddingJSON) == 0 {
-		return Embedding{}
+		return face.Embedding{}
 	} else if len(m.embedding) > 0 {
 		return m.embedding
 	} else if err := json.Unmarshal(m.EmbeddingJSON, &m.embedding); err != nil {
@@ -104,10 +103,10 @@ func (m *Face) Embedding() Embedding {
 }
 
 // Match tests if embeddings match this face.
-func (m *Face) Match(embeddings Embeddings) (match bool, dist float64) {
+func (m *Face) Match(embeddings face.Embeddings) (match bool, dist float64) {
 	dist = -1
 
-	if len(embeddings) == 0 {
+	if embeddings.Empty() {
 		// Np embeddings, no match.
 		return false, dist
 	}
@@ -119,9 +118,9 @@ func (m *Face) Match(embeddings Embeddings) (match bool, dist float64) {
 		return false, dist
 	}
 
-	// Calculate smallest distance to embeddings.
+	// Calculate the smallest distance to embeddings.
 	for _, e := range embeddings {
-		if d := clusters.EuclideanDistance(e, faceEmbedding); d < dist || dist < 0 {
+		if d := e.Distance(faceEmbedding); d < dist || dist < 0 {
 			dist = d
 		}
 	}
@@ -144,7 +143,7 @@ func (m *Face) Match(embeddings Embeddings) (match bool, dist float64) {
 }
 
 // ResolveCollision resolves a collision with a different subject's face.
-func (m *Face) ResolveCollision(embeddings Embeddings) (resolved bool, err error) {
+func (m *Face) ResolveCollision(embeddings face.Embeddings) (resolved bool, err error) {
 	if m.SubjUID == "" {
 		// Ignore reports for anonymous faces.
 		return false, nil