Move field repeated check to init

Author: WaVEV

django_mongodb_backend/indexes.py

@@ -167,34 +167,28 @@ class VectorSearchIndex(SearchIndex):
     ALLOWED_SIMILARITY_FUNCTIONS = frozenset(("euclidean", "cosine", "dotProduct"))
     _error_id_prefix = "django_mongodb_backend.indexes.VectorSearchIndex"
 
-    def __init__(self, *expressions, similarities="cosine", **kwargs):
-        super().__init__(*expressions, **kwargs)
+    def __init__(self, *expressions, fields=(), similarities="cosine", name=None, **kwargs):
+        super().__init__(*expressions, fields=fields, name=name, **kwargs)
         self.similarities = similarities
         for func in similarities if isinstance(similarities, list) else (similarities,):
             if func not in self.ALLOWED_SIMILARITY_FUNCTIONS:
                 raise ValueError(
                     f"{func} isn't a valid similarity function, options "
                     f"are {', '.join(sorted(self.ALLOWED_SIMILARITY_FUNCTIONS))}"
                 )
-
-    def check(self, model, connection):
-        errors = super().check(model, connection)
         viewed = set()
-        expected_similarities = 0
         for field_name, _ in self.fields_orders:
             if field_name in viewed:
-                errors.append(
-                    Error(
-                        f"Field '{field_name}' is defined more than once. Vector and filter "
-                        "fields must use distinct field names.",
-                        obj=self,
-                        hint="If you need different configurations for the same field, "
-                        "create separate indexes.",
-                        id=f"{self._error_id_prefix}.E004",
-                    )
+                raise ValueError(
+                    f"Field '{field_name}' is defined more than once. Vector and filter "
+                    "fields must use distinct field names.",
                 )
-                continue
             viewed.add(field_name)
+
+    def check(self, model, connection):
+        errors = super().check(model, connection)
+        expected_similarities = 0
+        for field_name, _ in self.fields_orders:
             field_ = model._meta.get_field(field_name)
             if isinstance(field_, ArrayField):
                 expected_similarities += 1

tests/indexes_/test_atlas_indexes.py

@@ -112,6 +112,17 @@ def test_invalid_similarity_function(self):
         with self.assertRaisesMessage(ValueError, msg):
             VectorSearchIndex(fields=["vector_data"], similarities="sum")
 
+    def test_define_field_twice(self):
+        msg = (
+            "Field 'vector_data' is defined more than once. Vector "
+            "and filter fields must use distinct field names."
+        )
+        with self.assertRaisesMessage(ValueError, msg):
+            VectorSearchIndex(
+                fields=["vector_data", "vector_data"],
+                similarities="dotProduct",
+            )
+
     @skipUnlessDBFeature("supports_atlas_search")
     def test_deconstruct_default_similarity(self):
         index = VectorSearchIndex(name="recent_article_idx", fields=["number"])
@@ -139,7 +150,7 @@ def test_index_not_created(self):
     def test_deconstruct_with_similarities(self):
         index = VectorSearchIndex(
             name="recent_article_idx",
-            fields=["number", "number"],
+            fields=["number", "headline"],
             similarities=["cosine", "dotProduct"],
         )
         path, args, kwargs = index.deconstruct()

tests/indexes_/test_checks.py

@@ -126,33 +126,6 @@ class Meta:
             ],
         )
 
-    def test_define_field_twice(self):
-        class Article(models.Model):
-            vector_data = ArrayField(models.DecimalField(), size=10)
-
-            class Meta:
-                indexes = [
-                    VectorSearchIndex(
-                        fields=["vector_data", "vector_data"],
-                        similarities="dotProduct",
-                    )
-                ]
-
-        errors = checks.run_checks(app_configs=self.apps.get_app_configs(), databases={"default"})
-        self.assertEqual(
-            errors,
-            [
-                checks.Error(
-                    "Field 'vector_data' is defined more than once. Vector and filter "
-                    "fields must use distinct field names.",
-                    id="django_mongodb_backend.indexes.VectorSearchIndex.E004",
-                    hint="If you need different configurations for the same field, "
-                    "create separate indexes.",
-                    obj=Article._meta.indexes[0],
-                ),
-            ],
-        )
-
     def test_invalid_number_similarity_function_singular(self):
         class Article(models.Model):
             vector_data = ArrayField(models.DecimalField(), size=10)