Implement Marqo index validation, fix tests and removed unused code (#…

…649)
marqo-ai · Nov 29, 2023 · fd8c9e6 · fd8c9e6
1 parent 3026a69
commit fd8c9e6
Show file tree

Hide file tree

Showing 48 changed files with 1,228 additions and 8,320 deletions.
diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -45,4 +45,5 @@ pydantic==1.10.11
 httpx==0.25.0
 
 # test requirements
-pyvespa==0.37.1
+pyvespa==0.37.1
+pytest==7.4.3
diff --git a/src/marqo/_httprequests.py b/src/marqo/_httprequests.py
diff --git a/src/marqo/core/constants.py b/src/marqo/core/constants.py
@@ -1,3 +1,4 @@
+MARQO_RESERVED_PREFIX = 'marqo__'
 MARQO_DOC_TENSORS = 'marqo__tensors'  # doc-level so must not clash with index field names
 MARQO_DOC_HIGHLIGHTS = '_highlights'  # doc-level so must not clash with index field names
 MARQO_DOC_CHUNKS = 'chunks'

diff --git a/src/marqo/core/index_management/index_management.py b/src/marqo/core/index_management/index_management.py
@@ -294,10 +294,6 @@ def _save_index_settings(self, marqo_index: MarqoIndex) -> None:
         """
         Create or update index settings in Vespa settings schema.
         """
-        # Don't store model properties if model is not custom
-        if not marqo_index.model.custom:
-            marqo_index.model.properties = None
-
         self.vespa_client.feed_document(
             VespaDocument(
                 id=marqo_index.name,