reorder validation business logic

chromadb/api/models/CollectionCommon.py

@@ -181,7 +181,7 @@ def _validate_embedding_set(
     ) -> None:
         valid_documents = documents
         valid_images = images
-        
+
         # Only one of documents or images can be provided
         if valid_documents is not None and valid_images is not None:
             raise ValueError("You can only provide documents or images, not both.")

chromadb/api/segment.py

@@ -51,7 +51,7 @@
 )
 
 import chromadb.types as t
-from typing import Optional, Sequence, Generator, List, cast, Set, Dict, Tuple, Any
+from typing import Optional, Sequence, Generator, List, cast, Set, Dict, Tuple, Union
 from overrides import override
 from uuid import UUID, uuid4
 import time
@@ -831,17 +831,13 @@ def _validate_embedding_record_set(
         uris: Optional[URIs] = None,
         metadatas: Optional[Metadatas] = None,
     ) -> None:
+        add_attributes_to_current_span({"collection_id": str(collection["id"])})
+
         validate_batch(
             (ids, embeddings, metadatas, documents, uris),
             {"max_batch_size": self.get_max_batch_size()},
         )
 
-        add_attributes_to_current_span({"collection_id": str(collection["id"])})
-
-        validate_ids(ids)
-        validate_embeddings(embeddings) if embeddings is not None else None
-        validate_metadatas(metadatas) if metadatas is not None else None
-
         if (
             require_embeddings_or_data
             and embeddings is None
@@ -850,7 +846,13 @@ def _validate_embedding_record_set(
         ):
             raise ValueError("You must provide embeddings, documents, or uris.")
 
-        entities: List[Tuple[Any, str]] = [
+        validate_ids(ids)
+        validate_embeddings(embeddings) if embeddings is not None else None
+        validate_metadatas(metadatas) if metadatas is not None else None
+
+        entities: List[
+            Tuple[Union[Embeddings, Metadatas, Documents, URIs, None], str]
+        ] = [
             (embeddings, "embeddings"),
             (metadatas, "metadatas"),
             (documents, "documents"),