[HOTFIX] revert server response with configuration_json for coll config

Author: jairad26

Diff for: chromadb/api/async_fastapi.py

@@ -15,6 +15,12 @@
     UpdateCollectionConfiguration,
     create_collection_configuration_to_json,
     update_collection_configuration_to_json,
+    create_collection_configuration_from_legacy_metadata_dict,
+    populate_create_hnsw_defaults,
+    validate_create_hnsw_config,
+    CreateHNSWConfiguration,
+    populate_create_spann_defaults,
+    validate_create_spann_config,
 )
 from chromadb.config import DEFAULT_DATABASE, DEFAULT_TENANT, System, Settings
 from chromadb.telemetry.opentelemetry import (
@@ -311,6 +317,54 @@ async def create_collection(
         )
         model = CollectionModel.from_json(resp_json)
 
+        # TODO: @jairad26 Remove this once server response contains configuration
+        hnsw = None
+        spann = None
+        if configuration is not None:
+            hnsw = configuration.get("hnsw")
+            spann = configuration.get("spann")
+
+        # if neither are specified, use the legacy metadata to populate the configuration
+        if hnsw is None and spann is None:
+            if model.metadata is not None:
+                # update the configuration with the legacy metadata
+                configuration = (
+                    create_collection_configuration_from_legacy_metadata_dict(
+                        model.metadata
+                    )
+                )
+                hnsw = configuration.get("hnsw")
+                spann = configuration.get("spann")
+
+        else:
+            # At this point we know at least one of hnsw or spann is not None
+            if hnsw is not None:
+                populate_create_hnsw_defaults(hnsw)
+                validate_create_hnsw_config(hnsw)
+            if spann is not None:
+                populate_create_spann_defaults(spann)
+                validate_create_spann_config(spann)
+
+            assert configuration is not None
+            configuration["hnsw"] = hnsw
+            configuration["spann"] = spann
+
+        # if hnsw and spann are both still None, it was neither specified in config nor in legacy metadata
+        # in this case, rfe will take care of defaults, so we just need to populate the hnsw config
+        if hnsw is None and spann is None:
+            hnsw = CreateHNSWConfiguration()
+            populate_create_hnsw_defaults(hnsw)
+            validate_create_hnsw_config(hnsw)
+            if configuration is not None:
+                configuration["hnsw"] = hnsw
+            else:
+                configuration = CreateCollectionConfiguration(hnsw=hnsw)
+
+        assert configuration is not None
+        model.configuration_json = create_collection_configuration_to_json(
+            configuration
+        )
+
         return model
 
     @trace_method("AsyncFastAPI.get_collection", OpenTelemetryGranularity.OPERATION)

Diff for: chromadb/api/collection_configuration.py

@@ -224,6 +224,26 @@ class CreateSpannConfiguration(TypedDict, total=False):
     merge_threshold: int
 
 
+def populate_create_spann_defaults(
+    config: CreateSpannConfiguration,
+) -> CreateSpannConfiguration:
+    if config.get("space") is None:
+        config["space"] = "l2"
+    if config.get("ef_construction") is None:
+        config["ef_construction"] = 200
+    if config.get("max_neighbors") is None:
+        config["max_neighbors"] = 64
+    if config.get("ef_search") is None:
+        config["ef_search"] = 200
+    if config.get("reassign_neighbor_count") is None:
+        config["reassign_neighbor_count"] = 64
+    if config.get("split_threshold") is None:
+        config["split_threshold"] = 200
+    if config.get("merge_threshold") is None:
+        config["merge_threshold"] = 100
+    return config
+
+
 def validate_create_spann_config(
     config: Optional[CreateSpannConfiguration], ef: Optional[EmbeddingFunction] = None  # type: ignore
 ) -> None:

Diff for: chromadb/api/fastapi.py

@@ -12,6 +12,12 @@
     UpdateCollectionConfiguration,
     update_collection_configuration_to_json,
     create_collection_configuration_to_json,
+    create_collection_configuration_from_legacy_metadata_dict,
+    populate_create_hnsw_defaults,
+    validate_create_hnsw_config,
+    CreateHNSWConfiguration,
+    validate_create_spann_config,
+    populate_create_spann_defaults,
 )
 from chromadb import __version__
 from chromadb.api.base_http_client import BaseHTTPClient
@@ -264,6 +270,57 @@ def create_collection(
         )
         model = CollectionModel.from_json(resp_json)
 
+        # TODO: @jairad26 Remove this once server response contains configuration
+        hnsw = None
+        spann = None
+        if configuration is not None:
+            hnsw = configuration.get("hnsw")
+            spann = configuration.get("spann")
+
+        # if neither are specified, use the legacy metadata to populate the configuration
+        print("Test legacy metadata: ", model.metadata)
+        if hnsw is None and spann is None:
+            if model.metadata is not None:
+                # update the configuration with the legacy metadata
+                configuration = (
+                    create_collection_configuration_from_legacy_metadata_dict(
+                        model.metadata
+                    )
+                )
+                print("Test legacy metadata configuration: ", configuration)
+                hnsw = configuration.get("hnsw")
+                spann = configuration.get("spann")
+
+        else:
+            # At this point we know at least one of hnsw or spann is not None
+            if hnsw is not None:
+                populate_create_hnsw_defaults(hnsw)
+                validate_create_hnsw_config(hnsw)
+            if spann is not None:
+                populate_create_spann_defaults(spann)
+                validate_create_spann_config(spann)
+
+            assert configuration is not None
+            configuration["hnsw"] = hnsw
+            configuration["spann"] = spann
+
+        # if hnsw and spann are both still None, it was neither specified in config nor in legacy metadata
+        # in this case, rfe will take care of defaults, so we just need to populate the hnsw config
+        if hnsw is None and spann is None:
+            hnsw = CreateHNSWConfiguration()
+            populate_create_hnsw_defaults(hnsw)
+            validate_create_hnsw_config(hnsw)
+            if configuration is not None:
+                configuration["hnsw"] = hnsw
+            else:
+                configuration = CreateCollectionConfiguration(hnsw=hnsw)
+
+        print("Test configuration: ", configuration)
+        assert configuration is not None
+        model.configuration_json = create_collection_configuration_to_json(
+            configuration
+        )
+
         return model
 
     @trace_method("FastAPI.get_collection", OpenTelemetryGranularity.OPERATION)

Diff for: chromadb/types.py

@@ -17,7 +17,6 @@
 from chromadb.api.collection_configuration import (
     CollectionConfiguration,
     HNSWConfiguration,
-    SpannConfiguration,
     collection_configuration_to_json,
     load_collection_configuration_from_json,
 )
@@ -156,7 +155,7 @@ def get_configuration(self) -> CollectionConfiguration:
             )
             return CollectionConfiguration(
                 hnsw=HNSWConfiguration(),
-                spann=SpannConfiguration(),
+                spann=None,
                 embedding_function=None,
             )
 
@@ -175,11 +174,11 @@ def get_model_fields(self) -> Dict[Any, Any]:
     @override
     def from_json(cls, json_map: Dict[str, Any]) -> Self:
         """Deserializes a Collection object from JSON"""
-        configuration: CollectionConfiguration = {
-            "hnsw": {},
-            "spann": {},
-            "embedding_function": None,
-        }
+        configuration = CollectionConfiguration(
+            hnsw=None,
+            spann=None,
+            embedding_function=None,
+        )
         try:
             configuration_json = json_map.get("configuration_json", None)
             configuration = load_collection_configuration_from_json(configuration_json)

Diff for: rust/types/src/collection.rs

@@ -52,7 +52,7 @@ impl std::fmt::Display for CollectionUuid {
     }
 }
 
-fn serialize_internal_collection_configuration<S: serde::Serializer>(
+fn _serialize_internal_collection_configuration<S: serde::Serializer>(
     config: &InternalCollectionConfiguration,
     serializer: S,
 ) -> Result<S::Ok, S::Error> {
@@ -76,7 +76,8 @@ pub struct Collection {
     pub collection_id: CollectionUuid,
     pub name: String,
     #[serde(
-        serialize_with = "serialize_internal_collection_configuration",
+        // serialize_with = "serialize_internal_collection_configuration",
+        skip_serializing,
         deserialize_with = "deserialize_internal_collection_configuration",
         rename = "configuration_json"
     )]