ci: add 3.11 (#906)

jarulraj · web-flow · commit 84aef2dd87b3 · 2023-06-27T13:45:39.000-04:00
👋 Thanks for submitting a Pull Request to EvaDB! 🙌 We want to make contributing to EvaDB as easy and transparent as possible. Here are a few tips to get you started: - 🔍 Search existing EvaDB [PRs](https://github.com/georgia-tech-db/eva/pulls) to see if a similar PR already exists. - 🔗 Link this PR to a EvaDB [issue](https://github.com/georgia-tech-db/eva/issues) to help us understand what bug fix or feature is being implemented. - 📈 Provide before and after profiling results to help us quantify the improvement your PR provides (if applicable). 👉 Please see our ✅ [Contributing Guide](https://evadb.readthedocs.io/en/stable/source/contribute/index.html) for more details.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -32,11 +32,11 @@ workflows:
             v: "3.10"
             mode: "TEST"
             ray: "DISABLED"
-        #- Linux:
-        #    name: "Test | v3.11 | Linux"
-        #    v: "3.11"
-        #    mode: "TEST"
-        #    ray: "DISABLED"
+        - Linux:
+            name: "Test | v3.11 | Linux"
+            v: "3.11"
+            mode: "TEST"
+            ray: "DISABLED"
         - Linux:
             name: "Test | Ray | v3.8 | Linux"
             v: "3.8"
@@ -78,11 +78,11 @@ workflows:
             v: "3.10"
             mode: "NOTEBOOK"
             ray: "DISABLED"
-        #- Linux:
-        #    name: "Notebook | v3.11 | Linux"
-        #    v: "3.11"
-        #    mode: "NOTEBOOK"
-        #    ray: "DISABLED"            
+        - Linux:
+            name: "Notebook | v3.11 | Linux"
+            v: "3.11"
+            mode: "NOTEBOOK"
+            ray: "DISABLED"            
         - Linux:
             name: "Notebook | Ray | v3.8 | Linux"
             v: "3.8"
@@ -169,6 +169,18 @@ jobs:
                   source test_evadb/bin/activate
                   python -c "import yaml;f = open('evadb/evadb.yml', 'r+');config_obj = yaml.load(f, Loader=yaml.FullLoader);config_obj['experimental']['ray'] = True;f.seek(0);f.write(yaml.dump(config_obj));f.truncate();"
                   pip install ".[ray]"
+      
+      # Install qdrant only on versions < 3.11
+      - when:
+          condition:
+            not:
+              equal: [ "3.11", << parameters.v >> ]
+          steps:
+            - run:
+                name: Install Qdrant
+                command: |
+                  source test_evadb/bin/activate
+                  pip install ".[qdrant]"
 
       - run:
           name: Test and upload coverage report to coveralls
diff --git a/script/test/test.sh b/script/test/test.sh
@@ -76,7 +76,7 @@ then
     # Non-Windows
     if [[ "$OSTYPE" != "msys" ]];
     then
-        PYTHONPATH=./ pytest --durations=20 --cov-report term-missing:skip-covered  --cov-config=.coveragerc --cov-context=test --cov=evadb/ --capture=sys --tb=short -v -rsf --log-level=WARNING -m "not benchmark"        
+        PYTHONPATH=./ pytest test/ --durations=20 --cov-report term-missing:skip-covered  --cov-config=.coveragerc --cov-context=test --cov=evadb/ --capture=sys --tb=short -v -rsf --log-level=WARNING -m "not benchmark"        
         test_code=$?
         if [ "$test_code" != "0" ];
         then
diff --git a/setup.py b/setup.py
@@ -87,7 +87,6 @@ def read(path, encoding="utf-8"):
     "thefuzz",  # FUZZY STRING MATCHING
     "pytube",  # YOUTUBE QA APP
     "youtube-transcript-api",  # YOUTUBE QA APP
-    "qdrant-client>=1.1.7",  # QDRANT VECTOR STORE
     "boto3",  # AWS
     "norfair>=2.2.0",  # OBJECT TRACKING
     "kornia",  # SIFT FEATURES
@@ -105,6 +104,10 @@ def read(path, encoding="utf-8"):
     "nest-asyncio>=1.5.6",
 ]
 
+qdrant_libs = [
+    "qdrant_client" # cannot install on 3.11 due to grcpio
+]
+
 ### NEEDED FOR DEVELOPER TESTING ONLY
 
 dev_libs = [
@@ -138,7 +141,8 @@ def read(path, encoding="utf-8"):
     "document": document_libs,
     "udf": udf_libs,
     "notebook": notebook_libs,
-    # everything except ray
+    "qdrant": qdrant_libs,
+    # everything except ray and qdrant
     "dev": dev_libs + vision_libs + document_libs + udf_libs + notebook_libs,
 }
 
diff --git a/test/interfaces/relational/test_relational_api.py b/test/interfaces/relational/test_relational_api.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import unittest
+from test.markers import qdrant_skip_marker
 from test.util import (
     DummyObjectDetector,
     create_sample_video,
@@ -46,7 +47,9 @@ def setUpClass(cls):
     def setUp(self):
         self.evadb.catalog().reset()
         self.mnist_path = f"{EvaDB_ROOT_DIR}/data/mnist/mnist.mp4"
-        load_udfs_for_testing(self.evadb,)
+        load_udfs_for_testing(
+            self.evadb,
+        )
         self.images = f"{EvaDB_ROOT_DIR}/data/detoxify/*.jpg"
 
     def tearDown(self):
@@ -57,15 +60,20 @@ def tearDown(self):
 
     def test_relation_apis(self):
         cursor = self.conn.cursor()
-        rel = cursor.load(self.mnist_path, table_name="mnist_video", format="video",)
+        rel = cursor.load(
+            self.mnist_path,
+            table_name="mnist_video",
+            format="video",
+        )
         rel.execute()
 
         rel = cursor.table("mnist_video")
         assert_frame_equal(rel.df(), cursor.query("select * from mnist_video;").df())
 
         rel = rel.select("_row_id, id, data")
         assert_frame_equal(
-            rel.df(), cursor.query("select _row_id, id, data from mnist_video;").df(),
+            rel.df(),
+            cursor.query("select _row_id, id, data from mnist_video;").df(),
         )
 
         rel = rel.filter("id < 10")
@@ -88,7 +96,11 @@ def test_relation_apis(self):
                     where id < 10 AND mnist.label = 1;"""
         assert_frame_equal(rel.df(), cursor.query(query).df())
 
-        rel = cursor.load(self.images, table_name="meme_images", format="image",)
+        rel = cursor.load(
+            self.images,
+            table_name="meme_images",
+            format="image",
+        )
         rel.execute()
 
         rel = cursor.table("meme_images").select("_row_id, name")
@@ -107,7 +119,11 @@ def test_relation_apis(self):
     def test_relation_api_chaining(self):
         cursor = self.conn.cursor()
 
-        rel = cursor.load(self.mnist_path, table_name="mnist_video", format="video",)
+        rel = cursor.load(
+            self.mnist_path,
+            table_name="mnist_video",
+            format="video",
+        )
         rel.execute()
 
         rel = (
@@ -126,7 +142,11 @@ def test_relation_api_chaining(self):
     def test_interleaving_calls(self):
         cursor = self.conn.cursor()
 
-        rel = cursor.load(self.mnist_path, table_name="mnist_video", format="video",)
+        rel = cursor.load(
+            self.mnist_path,
+            table_name="mnist_video",
+            format="video",
+        )
         rel.execute()
 
         rel = cursor.table("mnist_video")
@@ -142,11 +162,16 @@ def test_interleaving_calls(self):
             cursor.query("select _row_id, id from mnist_video where id > 10;").df(),
         )
 
+    @qdrant_skip_marker
     def test_create_index(self):
         cursor = self.conn.cursor()
 
         # load some images
-        rel = cursor.load(self.images, table_name="meme_images", format="image",)
+        rel = cursor.load(
+            self.images,
+            table_name="meme_images",
+            format="image",
+        )
         rel.execute()
 
         # todo support register udf
@@ -186,7 +211,11 @@ def test_create_udf_with_relational_api(self):
 
         cursor = self.conn.cursor()
         # load video
-        rel = cursor.load(video_file_path, table_name="dummy_video", format="video",)
+        rel = cursor.load(
+            video_file_path,
+            table_name="dummy_video",
+            format="video",
+        )
         rel.execute()
 
         create_dummy_object_detector_udf = cursor.create_udf(
@@ -238,7 +267,11 @@ def test_drop_with_relational_api(self):
 
         cursor = self.conn.cursor()
         # load video
-        rel = cursor.load(video_file_path, table_name="dummy_video", format="video",)
+        rel = cursor.load(
+            video_file_path,
+            table_name="dummy_video",
+            format="video",
+        )
         rel.execute()
 
         # Create dummy udf
@@ -294,13 +327,9 @@ def test_drop_with_relational_api(self):
     def test_pdf_similarity_search(self):
         conn = connect()
         cursor = conn.cursor()
-        pdf_path1 = f"{EvaDB_ROOT_DIR}/data/documents/state_of_the_union.pdf"
-        pdf_path2 = f"{EvaDB_ROOT_DIR}/data/documents/layout-parser-paper.pdf"
-
-        load_pdf = cursor.load(file_regex=pdf_path1, format="PDF", table_name="PDFs")
-        load_pdf.execute()
+        pdf_path = f"{EvaDB_ROOT_DIR}/data/documents/state_of_the_union.pdf"
 
-        load_pdf = cursor.load(file_regex=pdf_path2, format="PDF", table_name="PDFs")
+        load_pdf = cursor.load(file_regex=pdf_path, format="PDF", table_name="PDFs")
         load_pdf.execute()
 
         udf_check = cursor.drop_udf("SentenceFeatureExtractor")
@@ -316,7 +345,7 @@ def test_pdf_similarity_search(self):
             "faiss_index",
             table_name="PDFs",
             expr="SentenceFeatureExtractor(data)",
-            using="QDRANT",
+            using="FAISS",
         ).df()
 
         query = (
@@ -369,7 +398,11 @@ def test_show_relational(self):
 
         cursor = self.conn.cursor()
         # load video
-        rel = cursor.load(video_file_path, table_name="dummy_video", format="video",)
+        rel = cursor.load(
+            video_file_path,
+            table_name="dummy_video",
+            format="video",
+        )
         rel.execute()
 
         result = cursor.show("tables").df()
@@ -381,7 +414,11 @@ def test_explain_relational(self):
 
         cursor = self.conn.cursor()
         # load video
-        rel = cursor.load(video_file_path, table_name="dummy_video", format="video",)
+        rel = cursor.load(
+            video_file_path,
+            table_name="dummy_video",
+            format="video",
+        )
         rel.execute()
 
         result = cursor.explain("SELECT * FROM dummy_video").df()
@@ -396,7 +433,11 @@ def test_rename_relational(self):
 
         cursor = self.conn.cursor()
         # load video
-        rel = cursor.load(video_file_path, table_name="dummy_video", format="video",)
+        rel = cursor.load(
+            video_file_path,
+            table_name="dummy_video",
+            format="video",
+        )
         rel.execute()
 
         cursor.rename("dummy_video", "dummy_video_renamed").df()
diff --git a/test/markers.py b/test/markers.py
@@ -24,6 +24,11 @@
     sys.version_info < (3, 8), reason="Test case requires asyncio support"
 )
 
+qdrant_skip_marker = pytest.mark.skipif(
+    sys.version_info.minor == 11,
+    reason="qdrant requires grcpio which is broken on 3.11",
+)
+
 windows_skip_marker = pytest.mark.skipif(
     sys.platform == "win32", reason="Test case not supported on Windows"
 )
diff --git a/test/udfs/test_abstract_udf.py b/test/udfs/test_abstract_udf.py
@@ -75,6 +75,8 @@ def get_all_classes(module, level):
                                 class_list.append([obj])
                         except OSError:
                             pass
+                        except TypeError:
+                            pass
 
             flat_class_list = [item for sublist in class_list for item in sublist]
             return set(flat_class_list)

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@`
`24`	`24`	`sys.version_info < (3, 8), reason="Test case requires asyncio support"`
`25`	`25`	`)`
`26`	`26`
	`27`	`+qdrant_skip_marker = pytest.mark.skipif(`
	`28`	`+ sys.version_info.minor == 11,`
	`29`	`+ reason="qdrant requires grcpio which is broken on 3.11",`
	`30`	`+)`
	`31`	`+`
`27`	`32`	`windows_skip_marker = pytest.mark.skipif(`
`28`	`33`	`sys.platform == "win32", reason="Test case not supported on Windows"`
`29`	`34`	`)`