pyobvector 0.2.13__tar.gz → 0.2.14__tar.gz

{pyobvector-0.2.13 → pyobvector-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyobvector
-Version: 0.2.13
+Version: 0.2.14
 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.13
+pip install pyobvector==0.2.14
 ```
 
 ## Build Doc

{pyobvector-0.2.13 → pyobvector-0.2.14}/README.md

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

{pyobvector-0.2.13 → pyobvector-0.2.14}/pyobvector/client/ob_vec_client.py

@@ -90,11 +90,19 @@ class ObVecClient:
                     )
 
     def refresh_metadata(self, tables: Optional[list[str]] = None):
-        """Reload metadata from the database."""
-        if tables is None:
-            self.metadata_obj.reflect(bind=self.engine, extend_existing=True)
-        else:
+        """Reload metadata from the database.
+        
+        Args:
+            tables (Optional[list[str]]): names of the tables to refresh. If None, refresh all tables.
+        """
+        if tables is not None:
+            for table_name in tables:
+                if table_name in self.metadata_obj.tables:
+                    self.metadata_obj.remove(Table(table_name, self.metadata_obj))
             self.metadata_obj.reflect(bind=self.engine, only=tables, extend_existing=True)
+        else:
+            self.metadata_obj.clear()
+            self.metadata_obj.reflect(bind=self.engine, extend_existing=True)
 
     def _insert_partition_hint_for_query_sql(self, sql: str, partition_hint: str):
         from_index = sql.find("FROM")
@@ -808,3 +816,47 @@ class ObVecClient:
         with self.engine.connect() as conn:
             with conn.begin():
                 return conn.execute(text(text_sql))
+
+    def add_columns(
+        self,
+        table_name: str,
+        columns: list[Column],
+    ):
+        """Add multiple columns to an existing table.
+        
+        Args:
+            table_name (string): table name
+            columns (list[Column]): list of SQLAlchemy Column objects representing the new columns
+        """
+        compiler = self.engine.dialect.ddl_compiler(self.engine.dialect, None)
+        column_specs = [compiler.get_column_specification(column) for column in columns]
+        columns_ddl = ", ".join(f"ADD COLUMN {spec}" for spec in column_specs)
+        
+        with self.engine.connect() as conn:
+            with conn.begin():
+                conn.execute(
+                    text(f"ALTER TABLE `{table_name}` {columns_ddl}")
+                )
+                
+        self.refresh_metadata([table_name])
+
+    def drop_columns(
+        self,
+        table_name: str,
+        column_names: list[str],
+    ):
+        """Drop multiple columns from an existing table.
+        
+        Args:
+            table_name (string): table name
+            column_names (list[str]): names of the columns to drop
+        """
+        columns_ddl = ", ".join(f"DROP COLUMN `{name}`" for name in column_names)
+        
+        with self.engine.connect() as conn:
+            with conn.begin():
+                conn.execute(
+                    text(f"ALTER TABLE `{table_name}` {columns_ddl}")
+                )
+                
+        self.refresh_metadata([table_name])

{pyobvector-0.2.13 → pyobvector-0.2.14}/pyobvector/client/ob_vec_json_table_client.py

@@ -236,6 +236,7 @@ class ObVecJsonTableClient(ObVecClient):
             raise ValueError("Table name duplicated")
         
         session = self.session()
+        session.execute(text("SET @@session.autocommit=0"))
         new_meta_cache_items = []
         col_id = 16
         for col_def in ast.find_all(exp.ColumnDef):
@@ -607,6 +608,7 @@ class ObVecJsonTableClient(ObVecClient):
             raise ValueError(f"Table {jtable_name} does not exists")
         
         session = self.session()
+        session.execute(text("SET @@session.autocommit=0"))
         for action in ast.actions:
             if isinstance(action, ChangeColumn):
                 self._handle_alter_jtable_change_column(
@@ -681,6 +683,7 @@ class ObVecJsonTableClient(ObVecClient):
             raise ValueError(f"Invalid ast type {ast.this}")
 
         session = self.session()
+        session.execute(text("SET @@session.autocommit=0"))
         n_new_records = 0
         for tuple in ast.expression.expressions:
             expr_list = tuple.expressions

{pyobvector-0.2.13 → pyobvector-0.2.14}/pyobvector/schema/array.py

@@ -1,6 +1,6 @@
 """ARRAY: An extended data type for SQLAlchemy"""
 import json
-from typing import Any, List, Optional, Sequence, Union, Type
+from typing import Any, List, Optional, Sequence, Union
 
 from sqlalchemy.sql.type_api import TypeEngine
 from sqlalchemy.types import UserDefinedType, String
@@ -120,39 +120,3 @@ class ARRAY(UserDefinedType):
             return json.dumps(processed)
 
         return process
-
-
-def nested_array(dim: int) -> Type[ARRAY]:
-    """Create a nested array type class with specified dimensions.
-    
-    Args:
-        dim: The number of dimensions for the array type (1-6)
-        
-    Returns:
-        A class type that can be instantiated with an item_type to create a nested array
-        
-    Raises:
-        ValueError: If dim is not between 1 and 6
-    """
-    if not 1 <= dim <= 6:
-        raise ValueError("Dimension must be between 1 and 6")
-
-    class NestedArray(ARRAY):
-        cache_ok = True
-        _string = String()
-
-        def __init__(self, item_type: Union[TypeEngine, type]):
-            super(UserDefinedType, self).__init__()
-            if isinstance(item_type, type):
-                item_type = item_type()
-
-            assert not isinstance(item_type, ARRAY), "The item_type of NestedArray should not be an ARRAY type"
-
-            nested_type = item_type
-            for _ in range(dim):
-                nested_type = ARRAY(nested_type)
-
-            self.item_type = nested_type.item_type
-            self.dim = dim
-
-    return NestedArray

{pyobvector-0.2.13 → pyobvector-0.2.14}/pyobvector/schema/reflection.py

@@ -3,7 +3,7 @@ import re
 import logging
 from sqlalchemy.dialects.mysql.reflection import MySQLTableDefinitionParser, _re_compile, cleanup_text
 
-from pyobvector.schema.array import nested_array
+from pyobvector.schema.array import ARRAY
 
 logger = logging.getLogger(__name__)
 
@@ -100,7 +100,9 @@ class OceanBaseTableDefinitionParser(MySQLTableDefinitionParser):
                 item_type_args = [int(v) for v in self._re_csv_int.findall(item_type_arg)]
 
             nested_level = coltype_with_args.lower().count('array')
-            type_instance = nested_array(nested_level)(item_type(*item_type_args))
+            type_instance = item_type(*item_type_args)
+            for _ in range(nested_level):
+                type_instance = ARRAY(type_instance)
 
             col_kw = {}
 

{pyobvector-0.2.13 → pyobvector-0.2.14}/pyproject.toml

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