Merge pull request #1648 from weaviate/fix/config-add-property

Fix parsing of skip & vec_prop_name to moduleConfig

Author: tsmith023

integration/test_collection_config.py

@@ -1404,3 +1404,39 @@ def test_config_multi_vector_disabled(
     conf = config.vector_config["vec"].vector_index_config
     assert isinstance(conf, _VectorIndexConfigHNSW)
     assert conf.multi_vector is None
+
+
+@pytest.mark.parametrize(
+    "generative_config",
+    [
+        None,
+        Configure.Generative.anyscale(),
+    ],
+)
+@pytest.mark.parametrize(
+    "vectorizer_config",
+    [
+        None,
+        Configure.Vectorizer.none(),
+        Configure.Vectorizer.text2vec_contextionary(vectorize_collection_name=False),
+        [
+            Configure.NamedVectors.text2vec_contextionary(
+                name="vec",
+                vectorize_collection_name=False,
+            )
+        ],
+    ],
+)
+def test_config_add_property(
+    collection_factory: CollectionFactory, generative_config, vectorizer_config
+) -> None:
+    collection = collection_factory(
+        properties=[
+            Property(name="title", data_type=DataType.TEXT),
+        ],
+        generative_config=generative_config,
+        vectorizer_config=vectorizer_config,
+    )
+    collection.config.add_property(Property(name="description", data_type=DataType.TEXT))
+    config = collection.config.get()
+    assert "description" in [prop.name for prop in config.properties]

weaviate/collections/config/executor.py

@@ -186,19 +186,25 @@ def __add_property(self, additional_property: PropertyType) -> executor.Result[N
         obj = additional_property._to_dict()
 
         def resp(schema: Dict[str, Any]) -> executor.Result[None]:
-            if schema.get("moduleConfig"):
-                configured_module = list(schema.get("moduleConfig", {}).keys())[0]
-                modconf = {}
-                if "skip_vectorization" in obj:
-                    modconf["skip"] = obj["skip_vectorization"]
-                    del obj["skip_vectorization"]
-
-                if "vectorize_property_name" in obj:
-                    modconf["vectorizePropertyName"] = obj["vectorize_property_name"]
-                    del obj["vectorize_property_name"]
-
-                if len(modconf) > 0:
-                    obj["moduleConfig"] = {configured_module: modconf}
+            modconf = {}
+            if "skip_vectorization" in obj:
+                modconf["skip"] = obj["skip_vectorization"]
+                del obj["skip_vectorization"]
+
+            if "vectorize_property_name" in obj:
+                modconf["vectorizePropertyName"] = obj["vectorize_property_name"]
+                del obj["vectorize_property_name"]
+
+            module_config: Dict[str, Any] = schema.get("moduleConfig", {})
+            legacy_vectorizer = [
+                str(k) for k in module_config if "generative" not in k and "reranker" not in k
+            ]
+            if len(legacy_vectorizer) > 0 and len(modconf) > 0:
+                obj["moduleConfig"] = {legacy_vectorizer[0]: modconf}
+
+            vector_config: Dict[str, Any] = schema.get("vectorConfig", {})
+            if len(vector_config) > 0:
+                obj["vectorConfig"] = {key: modconf for key in vector_config.keys()}
 
             def inner_resp(res: Response) -> None:
                 return None