pyobvector 0.2.8__tar.gz → 0.2.10__tar.gz

{pyobvector-0.2.8 → pyobvector-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyobvector
-Version: 0.2.8
+Version: 0.2.10
 Summary: A python SDK for OceanBase Vector Store, based on SQLAlchemy, compatible with Milvus API.
 Author: shanhaikang.shk
 Author-email: shanhaikang.shk@oceanbase.com
@@ -15,7 +15,7 @@ Requires-Dist: aiomysql (>=0.2.0,<0.3.0)
 Requires-Dist: numpy (>=1.17.0,<2.0.0)
 Requires-Dist: pydantic (>=2.7.0,<3)
 Requires-Dist: pymysql (>=1.1.1,<2.0.0)
-Requires-Dist: sqlalchemy (>=1.4,<2.0.36)
+Requires-Dist: sqlalchemy (>=1.4,<=3)
 Requires-Dist: sqlglot (>=26.0.1,<27.0.0)
 Description-Content-Type: text/markdown
 
@@ -36,7 +36,7 @@ poetry install
 - install with pip:
 
 ```shell
-pip install pyobvector==0.2.8
+pip install pyobvector==0.2.10
 ```
 
 ## Build Doc

{pyobvector-0.2.8 → pyobvector-0.2.10}/README.md

@@ -15,7 +15,7 @@ poetry install
 - install with pip:
 
 ```shell
-pip install pyobvector==0.2.8
+pip install pyobvector==0.2.10
 ```
 
 ## Build Doc

{pyobvector-0.2.8 → pyobvector-0.2.10}/pyobvector/client/ob_vec_json_table_client.py

@@ -144,15 +144,16 @@ class ObVecJsonTableClient(ObVecClient):
         if self.user_id is None:
             return True
         
-        session = self.session()
-        distinct_admin_ids = (
-            session.query(ObVecJsonTableClient.JsonTableDataTBL.admin_id)
-            .filter_by(user_id = self.user_id)
-            .distinct()
-            .all()
-        )
-        admin_ids = [admin_id[0] for admin_id in distinct_admin_ids]
-        return (len(admin_ids) == 0) or (len(admin_ids) == 1 and admin_ids[0] == self.admin_id)
+        with self.session() as session:
+            with session.begin():
+                distinct_admin_ids = (
+                    session.query(ObVecJsonTableClient.JsonTableDataTBL.admin_id)
+                    .filter_by(user_id = self.user_id)
+                    .distinct()
+                    .all()
+                )
+                admin_ids = [admin_id[0] for admin_id in distinct_admin_ids]
+                return (len(admin_ids) == 0) or (len(admin_ids) == 1 and admin_ids[0] == self.admin_id)
 
     def _reset(self):
         # Only for test
@@ -845,6 +846,7 @@ class ObVecJsonTableClient(ObVecClient):
             new_select_exprs.append(data_id_col_expr)
             need_replace_select_exprs = True
 
+        alias_names = set()
         for select_expr in ast.args['expressions']:
             if isinstance(select_expr, exp.Star):
                 need_replace_select_exprs = True
@@ -856,6 +858,8 @@ class ObVecJsonTableClient(ObVecClient):
                     col_expr.args['this'] = identifier
                     new_select_exprs.append(col_expr)
             else:
+                if isinstance(select_expr, exp.Alias):
+                    alias_names.add(select_expr.args['alias'].args['this'])
                 new_select_exprs.append(select_expr)
         if need_replace_select_exprs:
             ast.args['expressions'] = new_select_exprs
@@ -864,6 +868,9 @@ class ObVecJsonTableClient(ObVecClient):
         json_table_str = f"json_table({JSON_TABLE_DATA_TABLE_NAME}.jdata, '$' COLUMNS ({', '.join(json_table_meta_str)})) {tmp_table_name}"
 
         for col in ast.find_all(exp.Column):
+            col_name = col.args["this"].args["this"]
+            if col_name in alias_names:
+                continue
             if 'table' in col.args.keys():
                 if col.args['table'].args['this'] != JSON_TABLE_DATA_TABLE_NAME:
                     col.args['table'].args['this'] = tmp_table_name
@@ -893,6 +900,6 @@ class ObVecJsonTableClient(ObVecClient):
             where_clause.args['this'] = parse_one(extra_filter_str)
             ast.args['where'] = where_clause
 
-        select_sql = str(ast)
+        select_sql = ast.sql(dialect="mysql", identify=True)
         logger.debug(f"===================== do select: {select_sql}")
         return self.perform_raw_text_sql(select_sql)

{pyobvector-0.2.8 → pyobvector-0.2.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyobvector"
-version = "0.2.8"
+version = "0.2.10"
 description = "A python SDK for OceanBase Vector Store, based on SQLAlchemy, compatible with Milvus API."
 authors = ["shanhaikang.shk <shanhaikang.shk@oceanbase.com>"]
 readme = "README.md"
@@ -8,7 +8,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
 numpy = ">=1.17.0,<2.0.0"
-sqlalchemy = ">=1.4,<2.0.36"
+sqlalchemy = ">=1.4,<=3"
 pymysql = "^1.1.1"
 aiomysql = "^0.2.0"
 sqlglot = "^26.0.1"