test: remove comments

docarray · hanxiao · Aug 26, 2022 · Jul 25, 2022 · Jul 26, 2022 · Jul 26, 2022
commit 8e89d146bbb8811f093452362c05560f7fdf205a
diff --git a/tests/unit/array/test_advance_indexing.py b/tests/unit/array/test_advance_indexing.py
@@ -2,11 +2,10 @@
 import pytest
 
 from docarray import DocumentArray, Document
-
-# from docarray.array.storage.weaviate import WeaviateConfig
-# from docarray.array.annlite import AnnliteConfig
-# from docarray.array.qdrant import QdrantConfig
-# from docarray.array.elastic import ElasticConfig
+from docarray.array.storage.weaviate import WeaviateConfig
+from docarray.array.annlite import AnnliteConfig
+from docarray.array.qdrant import QdrantConfig
+from docarray.array.elastic import ElasticConfig
 from docarray.array.redis import RedisConfig
 import gc
 
@@ -24,12 +23,12 @@ def indices():
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -58,11 +57,11 @@ def test_getter_int_str(docs, storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -87,12 +86,12 @@ def test_setter_int_str(docs, storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -122,12 +121,12 @@ def test_del_int_str(docs, storage, config, start_storage, indices):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -161,12 +160,12 @@ def test_slice(docs, storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -208,12 +207,12 @@ def test_sequence_bool_index(docs, storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -245,12 +244,12 @@ def test_sequence_int(docs, nparray, storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -280,12 +279,12 @@ def test_sequence_str(docs, storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -301,12 +300,12 @@ def test_docarray_list_tuple(docs, storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -341,12 +340,12 @@ def test_path_syntax_indexing(storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -427,12 +426,12 @@ def test_path_syntax_indexing_set(storage, config, start_storage):
 @pytest.mark.parametrize(
     'storage,config_gen',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', lambda: WeaviateConfig(n_dim=123)),
-        # ('annlite', lambda: AnnliteConfig(n_dim=123)),
-        # ('qdrant', lambda: QdrantConfig(n_dim=123)),
-        # ('elasticsearch', lambda: ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', lambda: WeaviateConfig(n_dim=123)),
+        ('annlite', lambda: AnnliteConfig(n_dim=123)),
+        ('qdrant', lambda: QdrantConfig(n_dim=123)),
+        ('elasticsearch', lambda: ElasticConfig(n_dim=123)),
         ('redis', lambda: RedisConfig(n_dim=123, flush=True)),
     ],
 )
@@ -465,10 +464,7 @@ def test_attribute_indexing(storage, config_gen, start_storage, size):
 
 @pytest.mark.parametrize(
     'storage',
-    [
-        # \'memory', 'sqlite', 'weaviate', 'annlite', 'qdrant', 'elasticsearch',
-        'redis'
-    ],
+    ['memory', 'sqlite', 'weaviate', 'annlite', 'qdrant', 'elasticsearch', 'redis'],
 )
 def test_tensor_attribute_selector(storage, start_storage):
     import scipy.sparse
@@ -502,31 +498,28 @@ def test_tensor_attribute_selector(storage, start_storage):
     assert isinstance(v1, list)
 
 
-# # TODO: since match function is not implemented, this test will
-# # not work with weaviate storage atm, will be addressed in
-# # next version
-# @pytest.mark.parametrize('storage', ['memory', 'sqlite', 'annlite'])
-# def test_advance_selector_mixed(storage):
-#     if storage == 'annlite':
-#         da = DocumentArray(storage=storage, config={'n_dim': 3})
-#     else:
-#         da = DocumentArray(storage=storage)
+# TODO: since match function is not implemented, this test will
+# not work with weaviate storage atm, will be addressed in
+# next version
+@pytest.mark.parametrize('storage', ['memory', 'sqlite', 'annlite'])
+def test_advance_selector_mixed(storage):
+    if storage == 'annlite':
+        da = DocumentArray(storage=storage, config={'n_dim': 3})
+    else:
+        da = DocumentArray(storage=storage)
 
-#     da.extend(DocumentArray.empty(10))
-#     da.embeddings = np.random.random([10, 3])
+    da.extend(DocumentArray.empty(10))
+    da.embeddings = np.random.random([10, 3])
 
-#     da.match(da, exclude_self=True)
+    da.match(da, exclude_self=True)
 
-#     assert len(da[:, ('id', 'embedding', 'matches')]) == 3
-#     assert len(da[:, ('id', 'embedding', 'matches')][0]) == 10
+    assert len(da[:, ('id', 'embedding', 'matches')]) == 3
+    assert len(da[:, ('id', 'embedding', 'matches')][0]) == 10
 
 
 @pytest.mark.parametrize(
     'storage',
-    [
-        # 'memory', 'sqlite', 'weaviate', 'annlite', 'qdrant', 'elasticsearch',
-        'redis'
-    ],
+    ['memory', 'sqlite', 'weaviate', 'annlite', 'qdrant', 'elasticsearch', 'redis'],
 )
 def test_single_boolean_and_padding(storage, start_storage):
     if storage in ('annlite', 'weaviate', 'qdrant', 'elasticsearch', 'redis'):
@@ -549,19 +542,24 @@ def test_single_boolean_and_padding(storage, start_storage):
     assert len(da[True, False, False]) == 1
 
 
+@pytest.fixture()
+def ensure_gc():
+    gc.collect()
+
+
 @pytest.mark.parametrize(
     'storage,config_gen',
     [
-        # ('memory', None),
-        # ('sqlite', None),
-        # ('weaviate', lambda: WeaviateConfig(n_dim=123)),
-        # ('annlite', lambda: AnnliteConfig(n_dim=123)),
-        # ('qdrant', lambda: QdrantConfig(n_dim=123)),
-        # ('elasticsearch', lambda: ElasticConfig(n_dim=123)),
+        ('memory', None),
+        ('sqlite', None),
+        ('weaviate', lambda: WeaviateConfig(n_dim=123)),
+        ('annlite', lambda: AnnliteConfig(n_dim=123)),
+        ('qdrant', lambda: QdrantConfig(n_dim=123)),
+        ('elasticsearch', lambda: ElasticConfig(n_dim=123)),
         ('redis', lambda: RedisConfig(n_dim=123, flush=True)),
     ],
 )
-def test_edge_case_two_strings(storage, config_gen, start_storage):
+def test_edge_case_two_strings(storage, config_gen, ensure_gc, start_storage):
     # getitem
     if config_gen:
         da = DocumentArray(storage=storage, config=config_gen())
@@ -628,28 +626,22 @@ def test_edge_case_two_strings(storage, config_gen, start_storage):
         da['1', 'hellohello'] = 'hello'
 
     if storage == 'redis':
-        gc.collect()
+        ensure_gc
 
 
-# TODO: since redis has flush, this test should be rewrite for redis
 @pytest.mark.parametrize(
     'storage,config',
     [
-        # ('sqlite', None),
-        # ('weaviate', WeaviateConfig(n_dim=123)),
-        # ('annlite', AnnliteConfig(n_dim=123)),
-        # ('qdrant', QdrantConfig(n_dim=123)),
-        # ('elasticsearch', ElasticConfig(n_dim=123)),
+        ('sqlite', None),
+        ('weaviate', WeaviateConfig(n_dim=123)),
+        ('annlite', AnnliteConfig(n_dim=123)),
+        ('qdrant', QdrantConfig(n_dim=123)),
+        ('elasticsearch', ElasticConfig(n_dim=123)),
         ('redis', RedisConfig(n_dim=123, flush=True)),
     ],
 )
 def test_offset2ids_persistence(storage, config, start_storage):
-    # config = RedisConfig(n_dim=123, flush=True)
-    # storage = 'redis'
-    if storage == 'redis':
-        da = DocumentArray(storage=storage, config=config)
-    else:
-        da = DocumentArray(storage=storage, config=config)
+    da = DocumentArray(storage=storage, config=config)
 
     da.extend(
         [
@@ -661,9 +653,6 @@ def test_offset2ids_persistence(storage, config, start_storage):
     da.insert(1, Document(id='1'))
     da.insert(3, Document(id='3'))
 
-    # print('aaa')
-    # print(da._offset2ids.ids)
-
     config = da._config
     da_ids = da[:, 'id']
     assert da_ids == [str(i) for i in range(5)]