add http_api_test

.github/workflows/tests.yml

@@ -62,17 +62,21 @@ jobs:
         if: ${{ !cancelled() && !failure() }}
         run: sudo docker exec infinity_build bash -c "cd /infinity/python && python3 setup.py install"
 
-      - name: Start infinity pysdk debug version
+      - name: Start infinity pysdk & http_api debug version
         if: ${{ !cancelled() && !failure() }}
         run: |
           # Run a command in the background
           sudo docker exec infinity_build bash -c "cd /infinity/ && rm -fr /tmp/infinity && cmake-build-debug/src/infinity > debug.log 2>&1" &
 
       - name: pysdk debug version
         if: ${{ !cancelled() && !failure() }}
-        run: sudo docker exec infinity_build bash -c "cd /infinity/ && python3 tools/run_pysdk_test.py"
+        run: sudo docker exec infinity_build bash -c "cd /infinity/ && python3 tools/run_pysdk_test.py" && sleep 1s
 
-      - name: Stop infinity pysdk debug
+      - name: http_api debug version
+        if: ${{ !cancelled() && !failure() }}
+        run: sudo docker exec infinity_build bash -c "cd /infinity/ && python3 tools/run_http_api.py" && sleep 1s
+
+      - name: Stop infinity pysdk & http_api debug
         if: ${{ !cancelled() }} # always run this step even if previous steps failed
         run: sudo kill $(pidof cmake-build-debug/src/infinity) && sleep 5s
 
@@ -139,17 +143,21 @@ jobs:
         if: ${{ !cancelled() && !failure() }}
         run: sudo docker exec infinity_build bash -c "cd /infinity/python && rm -fr dist/* && python setup.py sdist bdist_wheel && pip uninstall -y infinity-sdk && pip install dist/*.whl"
 
-      - name: Start infinity pysdk release version
+      - name: Start infinity pysdk & http_api release version
         if: ${{ !cancelled() && !failure() }}
         run: |
           # Run a command in the background
            sudo docker exec infinity_build bash -c "cd /infinity/ && rm -fr /tmp/infinity && cmake-build-release/src/infinity > release.log 2>&1" &
 
       - name: pysdk release version
         if: ${{ !cancelled() && !failure() }}
-        run: sudo docker exec infinity_build bash -c "cd /infinity/ && python3 tools/run_pysdk_test.py"
+        run: sudo docker exec infinity_build bash -c "cd /infinity/ && python3 tools/run_pysdk_test.py" && sleep 1s
+
+      - name: http_api release version
+        if: ${{ !cancelled() && !failure() }}
+        run: sudo docker exec infinity_build bash -c "cd /infinity/ && python3 tools/run_http_api.py" && sleep 1s
 
-      - name: Stop infinity pysdk release
+      - name: Stop infinity pysdk & http_api release
         if: ${{ !cancelled() }} # always run this step even if previous steps failed
         run: sudo kill $(pidof cmake-build-release/src/infinity) && sleep 5s
 

python/pyproject.toml

@@ -30,8 +30,10 @@ markers =[
     "L3",
     "complex",
     "slow",
-    "nightly"
+    "nightly",
 ]
+
+
 filterwarnings = [
     "error",
     "ignore::UserWarning",

python/run_all_test.py

@@ -13,12 +13,22 @@
 # limitations under the License.
 
 import os
+import pytest 
 
+#import delete table insert update show knn index database
 
-def run():
+
+def run_sdk():
     os.system("cd test")
     os.system("python3 -m pytest -m 'not complex and not slow' test")
 
+def run_http():
+    os.system("cd test_http_api")
+    os.system("python3 -m pytest -m 'not complex and not slow' test_http_api/test_index.py")   
+
+
+# def run_all():
+#     test_base.test_table(HttpTest)
 
 if __name__ == '__main__':
-    run()
+    run_http()

python/setup.py

@@ -15,4 +15,4 @@
 import setuptools
 
 if __name__ == "__main__":
-    setuptools.setup()
+    setuptools.setup(packages=['infinity', 'infinity.remote_thrift', 'infinity.remote_thrift.infinity_thrift_rpc'])

python/test/common/common_values.py

@@ -56,8 +56,36 @@
     'name-12',
     '12name',
     '数据库名',
-    ''.join('x' for i in range(identifier_limit + 1)),
-    None,
+    #''.join('x' for i in range(identifier_limit + 1)),
+    #None,
+]
+
+types = [
+            "integer", "tinyint", "smallint", "bigint", "hugeint", "float",
+             "double", "varchar", "boolean"
+        ]
+types_example = [
+    1, 127, 32767, 2147483647, pow(2, 63) - 1, 10.33,11.22,"a",True 
+]
+
+check_file_data =  [{"file_name": "pysdk_test_blankspace.csv"},
+               {"file_name": "pysdk_test_commas.csv"},
+               {"file_name": "pysdk_test_semicolons.csv"},
+               {"file_name": "pysdk_test_tabular.csv"}]
+delimiter = [["blankspace", " "],["commas", ","],["semicolons", ";"],["tabular", "\t"]]
+
+
+create_valid_option = [
+    "kError","kIgnore","kReplace"
+]
+create_invalid_option = [
+    1.1,"#@$@!%string",[],{},()
+]
+drop_valid_option = [
+     "kError","kIgnore"
+]
+drop_invalid_option = [
+    "kReplace",1.1,"#@$@!%string",[],{},()
 ]
 
 invalid_vector_array = []

python/test/conftest.py

@@ -46,7 +46,6 @@ def get_infinity_db():
     res = infinity_obj.disconnect()
     assert res.error_code == ErrorCode.OK
 
-
 @pytest.fixture(scope="function", autouse=False)
 def get_infinity_connection_pool():
     connection_pool = ConnectionPool(common_values.TEST_REMOTE_HOST)

python/test/test_basic.py

@@ -23,15 +23,15 @@
 from infinity.errors import ErrorCode
 from infinity.common import ConflictType
 from utils import copy_data
+from test_sdkbase import TestSdk
 
 test_csv_file = "embedding_int_dim3.csv"
 
-
-class TestCase:
+class TestCase(TestSdk):
     def test_version(self):
         print(infinity.__version__)
-
     def test_connection(self):
+
         """
         target: test connect and disconnect server ok
         method: connect server
@@ -42,7 +42,8 @@ def test_connection(self):
             infinity_obj = infinity.connect(common_values.TEST_REMOTE_HOST)
             assert infinity_obj
             assert infinity_obj.disconnect()
-
+
+
     def test_create_db_with_invalid_name(self):
         """
         target: test db name limitation
@@ -57,7 +58,8 @@ def test_create_db_with_invalid_name(self):
                            match=f"DB name '{db_name}' is not valid. It should start with a letter and can contain only letters, numbers and underscores"):
             db = infinity_obj.create_database("")
         assert infinity_obj.disconnect()
-
+
+
     @pytest.mark.parametrize("check_data", [{"file_name": "embedding_int_dim3.csv",
                                              "data_dir": common_values.TEST_TMP_DIR}], indirect=True)
     def test_basic(self, check_data):

python/test/test_condition.py

@@ -15,9 +15,9 @@
 from sqlglot import condition
 
 from infinity.remote_thrift.table import traverse_conditions
+from test_sdkbase import TestSdk
 
-
-class TestCondition:
+class TestCondition(TestSdk):
 
     def test_traverse_conditions(self):
         res = (condition("c1 > 1 and c2 < 2 or c3 = 3.3"))

python/test/test_connect.py

@@ -17,8 +17,8 @@
 import infinity
 from infinity.common import NetworkAddress
 
-
-class TestConnection:
+from test_sdkbase import TestSdk
+class TestConnection(TestSdk):
     def test_connect_and_disconnect_ok(self):
         """
         target: test connect and server ok

python/test/test_connection_pool.py

@@ -2,8 +2,9 @@
 import time
 from infinity.connection_pool import ConnectionPool
 from infinity.common import ConflictType
+from test_sdkbase import TestSdk
 
-class TestConnectionPool:
+class TestConnectionPool(TestSdk):
     #test whether the connection get from the pool could work properly and the management of pool is correct.
     def test_basic(self):
         connction_pool = ConnectionPool(uri=common_values.TEST_REMOTE_HOST, min_size=4, max_size=8)

python/test/test_convert.py

@@ -5,8 +5,9 @@
 import infinity
 from infinity.remote_thrift.query_builder import InfinityThriftQueryBuilder
 from infinity.common import ConflictType
+from test_sdkbase import TestSdk
 
-class TestConvert:
+class TestConvert(TestSdk):
     def test_to_pl(self):
         infinity_obj = infinity.connect(common_values.TEST_REMOTE_HOST)
         db_obj = infinity_obj.get_database("default")

python/test/test_database.py

@@ -19,9 +19,10 @@
 from infinity.common import ConflictType
 from infinity.errors import ErrorCode
 from infinity.common import ConflictType
+from test_sdkbase import TestSdk
 
 
-class TestDatabase:
+class TestDatabase(TestSdk):
 
     def test_version(self):
         print(infinity.__version__)

python/test/test_delete.py

@@ -22,9 +22,10 @@
 from infinity.errors import ErrorCode
 from infinity.common import ConflictType
 from utils import trace_expected_exceptions
+from test_sdkbase import TestSdk
 
 
-class TestDelete:
+class TestDelete(TestSdk):
 
     def test_version(self):
         print(infinity.__version__)

python/test/test_explain.py

@@ -19,9 +19,9 @@
 import infinity
 from infinity.table import ExplainType
 from infinity.common import ConflictType
+from test_sdkbase import TestSdk
 
-
-class TestExplain:
+class TestExplain(TestSdk):
 
     def test_explain_default(self):
         """

python/test/test_import.py

@@ -20,12 +20,13 @@
 import infinity
 from infinity.errors import ErrorCode
 from infinity.common import ConflictType
+from test_sdkbase import TestSdk
 
 from utils import generate_big_int_csv, copy_data, generate_big_rows_csv, generate_big_columns_csv, generate_fvecs, \
     generate_commas_enwiki
 
 
-class TestImport:
+class TestImport(TestSdk):
 
     def test_version(self):
         print(infinity.__version__)
@@ -465,4 +466,4 @@ def test_import_exceeding_columns(self, get_infinity_db, check_data):
         print(res)
         db_obj.drop_table("test_import_exceeding_columns", ConflictType.Error)
 
-    # TODO: JSON file type import test
+    # TODO: JSON file type import test

python/test/test_index.py

@@ -21,11 +21,12 @@
 from utils import copy_data
 from infinity.common import ConflictType
 from infinity.errors import ErrorCode
+from test_sdkbase import TestSdk
 
 TEST_DATA_DIR = "/test/data/"
 
 
-class TestIndex:
+class TestIndex(TestSdk):
 
     def test_create_index_IVFFlat(self, get_infinity_db):
         db_obj = get_infinity_db
@@ -519,6 +520,7 @@ def test_create_index_on_deleted_table(self, get_infinity_db):
         table_obj.insert(value)
         res = table_obj.output(["*"]).to_pl()
         print(res)
+
 
         # delete data
         table_obj.delete()
@@ -547,7 +549,6 @@ def test_create_index_on_update_table(self, get_infinity_db):
                           ConflictType.Ignore)
         table_obj = db_obj.create_table("test_create_index_on_update_table", {"c1": "vector,128,float", "c2": "int"},
                                         ConflictType.Error)
-
         # insert data
         embedding_data = [i for i in range(128)]
         value = [{"c1": embedding_data, "c2": i} for i in range(10)]

python/test/test_index_parallel.py

@@ -10,10 +10,12 @@
 from infinity.connection_pool import ConnectionPool
 from infinity.errors import ErrorCode
 
+from test_sdkbase import TestSdk
+
 TEST_DATA_DIR = "/test/data/"
 
 
-class TestIndexParallel:
+class TestIndexParallel(TestSdk):
 
     @pytest.mark.parametrize("file_format", ["csv"])
     @pytest.mark.skip(reason="deadlock caused by compaction")

python/test/test_infinity.py

@@ -21,9 +21,9 @@
 from infinity.remote_thrift.client import ThriftInfinityClient
 
 from common import common_values
+from test_sdkbase import TestSdk
 
-
-class TestInfinity:
+class TestInfinity(TestSdk):
 
     def test_get_database(self):
         infinity_obj = ThriftInfinityClient(common_values.TEST_REMOTE_HOST)

python/test/test_insert.py

@@ -25,9 +25,10 @@
 from infinity.common import ConflictType
 from infinity.errors import ErrorCode
 from utils import start_infinity_service_in_subporcess
+from test_sdkbase import TestSdk
 
 
-class TestInsert:
+class TestInsert(TestSdk):
 
     def test_version(self):
         print(infinity.__version__)

python/test/test_knn.py

@@ -22,9 +22,10 @@
 from infinity.common import ConflictType
 
 from utils import copy_data, generate_commas_enwiki
+from test_sdkbase import TestSdk
 
 
-class TestKnn:
+class TestKnn(TestSdk):
 
     def test_version(self):
         print(infinity.__version__)

python/test/test_query.py

@@ -21,9 +21,10 @@
 from infinity.remote_thrift.query_builder import InfinityThriftQueryBuilder
 from infinity.remote_thrift.table import RemoteTable
 from infinity.common import ConflictType
+from test_sdkbase import TestSdk
 
 
-class TestQuery:
+class TestQuery(TestSdk):
     def test_query(self):
         conn = ThriftInfinityClient(common_values.TEST_REMOTE_HOST)
         db = RemoteDatabase(conn, "default")

python/test/test_sdkbase.py

@@ -0,0 +1,3 @@
+class TestSdk():
+    def test_version(self):
+        print("test_sdk")

python/test/test_select.py

@@ -22,9 +22,10 @@
 from infinity.errors import ErrorCode
 from infinity.common import ConflictType
 from utils import copy_data
+from test_sdkbase import TestSdk
 
 
-class TestSelect:
+class TestSelect(TestSdk):
 
     def test_version(self):
         print(infinity.__version__)