pyobvector 0.2.5__tar.gz → 0.2.7__tar.gz

{pyobvector-0.2.5 → pyobvector-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyobvector
-Version: 0.2.5
+Version: 0.2.7
 Summary: A python SDK for OceanBase Vector Store, based on SQLAlchemy, compatible with Milvus API.
 Author: shanhaikang.shk
 Author-email: shanhaikang.shk@oceanbase.com
@@ -36,7 +36,7 @@ poetry install
 - install with pip:
 
 ```shell
-pip install pyobvector==0.2.5
+pip install pyobvector==0.2.7
 ```
 
 ## Build Doc

{pyobvector-0.2.5 → pyobvector-0.2.7}/README.md

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

{pyobvector-0.2.5 → pyobvector-0.2.7}/pyobvector/client/ob_vec_client.py

@@ -20,6 +20,7 @@ from sqlalchemy.exc import NoSuchTableError
 from sqlalchemy.dialects import registry
 import sqlalchemy.sql.functions as func_mod
 import numpy as np
+from urllib.parse import quote
 from .index_param import IndexParams, IndexParam
 from .fts_index_param import FtsIndexParam
 from ..schema import (
@@ -67,8 +68,8 @@ class ObVecClient:
         setattr(func_mod, "st_dwithin", st_dwithin)
         setattr(func_mod, "st_astext", st_astext)
 
-        # Escape @ to avoid parsing errors in connection_str
-        password = password.replace('@', '%40')
+        user = quote(user, safe="")
+        password = quote(password, safe="")
         
         connection_str = (
             f"mysql+oceanbase://{user}:{password}@{uri}/{db_name}?charset=utf8mb4"

{pyobvector-0.2.5 → pyobvector-0.2.7}/pyobvector/client/ob_vec_json_table_client.py

@@ -72,7 +72,7 @@ class ObVecJsonTableClient(ObVecClient):
                 if col_type == 'VARCHAR':
                     factory = JsonTableVarcharFactory(255)
                 else:
-                    varchar_pattern = r'VARCHAR\((\d+)\)'
+                    varchar_pattern = r'VARCHAR\s*\((\d+)\)'
                     varchar_matches = re.findall(varchar_pattern, col_type)
                     factory = JsonTableVarcharFactory(int(varchar_matches[0]))
                 model = factory.get_json_table_varchar_type()
@@ -163,7 +163,7 @@ class ObVecJsonTableClient(ObVecClient):
     def refresh_metadata(self) -> None:
         self.jmetadata.reflect(self.engine)
 
-    def perform_json_table_sql(self, sql: str) -> Optional[CursorResult]:
+    def perform_json_table_sql(self, sql: str, select_with_data_id: bool = False) -> Optional[CursorResult]:
         """Perform common SQL that operates on JSON Table."""
         ast = parse_one(sql, dialect="oceanbase")
         if isinstance(ast, exp.Create):
@@ -185,7 +185,7 @@ class ObVecJsonTableClient(ObVecClient):
             self._handle_jtable_dml_delete(ast)
             return None
         elif isinstance(ast, exp.Select):
-            return self._handle_jtable_dml_select(ast)
+            return self._handle_jtable_dml_select(ast, select_with_data_id)
         else:
             raise ValueError(f"{type(ast)} not supported")
         
@@ -788,7 +788,7 @@ class ObVecJsonTableClient(ObVecClient):
             return "DECIMAL(10, 0)"
         return jdata_type
 
-    def _handle_jtable_dml_select(self, ast: Expression):
+    def _handle_jtable_dml_select(self, ast: Expression, select_with_data_id: bool = False):
         table_name = ast.args['from'].this.this.this
         if not self._check_table_exists(table_name):
             raise ValueError(f"Table {table_name} does not exists")
@@ -807,6 +807,20 @@ class ObVecJsonTableClient(ObVecClient):
         
         need_replace_select_exprs = False
         new_select_exprs = []
+
+        if select_with_data_id:
+            data_id_col_expr = exp.Column()
+            data_id_identifier = exp.Identifier()
+            data_id_identifier.args['this'] = 'jdata_id'
+            data_id_identifier.args['quoted'] = False
+            data_json_table_identifier = exp.Identifier()
+            data_json_table_identifier.args['this'] = JSON_TABLE_DATA_TABLE_NAME
+            data_json_table_identifier.args['quoted'] = False
+            data_id_col_expr.args['this'] = data_id_identifier
+            data_id_col_expr.args['table'] = data_json_table_identifier
+            new_select_exprs.append(data_id_col_expr)
+            need_replace_select_exprs = True
+
         for select_expr in ast.args['expressions']:
             if isinstance(select_expr, exp.Star):
                 need_replace_select_exprs = True
@@ -827,7 +841,8 @@ class ObVecJsonTableClient(ObVecClient):
 
         for col in ast.find_all(exp.Column):
             if 'table' in col.args.keys():
-                col.args['table'].args['this'] = tmp_table_name
+                if col.args['table'].args['this'] != JSON_TABLE_DATA_TABLE_NAME:
+                    col.args['table'].args['this'] = tmp_table_name
             else:
                 identifier = exp.Identifier()
                 identifier.args['this'] = tmp_table_name

{pyobvector-0.2.5 → pyobvector-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyobvector"
-version = "0.2.5"
+version = "0.2.7"
 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"