pyobvector 0.2.19__py3-none-any.whl → 0.2.20__py3-none-any.whl

pyobvector/client/hybrid_search.py

@@ -30,13 +30,9 @@ class HybridSearch(Client):
         
         if self.ob_version < min_required_version:
             # For versions < 4.4.1.0, check if it's SeekDB
-            with self.engine.connect() as conn:
-                with conn.begin():
-                    res = conn.execute(text("SELECT version()"))
-                    version_str = [r[0] for r in res][0]
-                    if "SeekDB" in version_str:
-                        logger.info(f"SeekDB detected in version string: {version_str}, allowing hybrid search")
-                        return
+            if self._is_seekdb():
+                logger.info("SeekDB detected, allowing hybrid search")
+                return
             raise ClusterVersionException(
                 code=ErrorCode.NOT_SUPPORTED,
                 message=ExceptionsMessage.ClusterVersionIsLow % ("Hybrid Search", "4.4.1.0"),

pyobvector/client/index_param.py

@@ -134,8 +134,11 @@ class IndexParam:
                 if 'efSearch' in params:
                     ob_params['ef_search'] = params['efSearch']
         
-        if self.is_index_type_sparse_vector() and ob_params['distance'] != 'inner_product':
-            raise ValueError("Metric type should be 'inner_product' for sparse vector index.")
+        if self.is_index_type_sparse_vector():
+            if ob_params['distance'] != 'inner_product':
+                raise ValueError("Metric type should be 'inner_product' for sparse vector index.")
+            if 'sparse_index_type' in self.kwargs:
+                ob_params['type'] = self.kwargs['sparse_index_type']
         return ob_params
 
     def param_str(self):

pyobvector/client/ob_client.py

@@ -93,6 +93,26 @@ class ObClient:
             self.metadata_obj.clear()
             self.metadata_obj.reflect(bind=self.engine, extend_existing=True)
 
+    def _is_seekdb(self) -> bool:
+        """Check if the database is SeekDB by querying version.
+        
+        Returns:
+            bool: True if database is SeekDB, False otherwise
+        """
+        is_seekdb = False
+        try:
+            if hasattr(self, '_is_seekdb_cached'):
+                return self._is_seekdb_cached
+            with self.engine.connect() as conn:
+                result = conn.execute(text("SELECT VERSION()"))
+                version_str = [r[0] for r in result][0]
+                is_seekdb = "SeekDB" in version_str
+                self._is_seekdb_cached = is_seekdb
+                logger.debug(f"Version query result: {version_str}, is_seekdb: {is_seekdb}")
+        except Exception as e:
+            logger.warning(f"Failed to query version: {e}")
+        return is_seekdb
+
     def _insert_partition_hint_for_query_sql(self, sql: str, partition_hint: str):
         from_index = sql.find("FROM")
         assert from_index != -1

pyobvector/client/ob_vec_client.py

@@ -99,7 +99,11 @@ class ObVecClient(ObClient):
                     create_table_sql = str(CreateTable(table).compile(self.engine))
                     new_sql = create_table_sql[:create_table_sql.rfind(')')]
                     for sparse_vidx in sparse_vidxs:
-                        new_sql += f",\n\tVECTOR INDEX {sparse_vidx.index_name}({sparse_vidx.field_name}) with (distance=inner_product)"
+                        sparse_params = sparse_vidx._parse_kwargs()
+                        if 'type' in sparse_params:
+                            new_sql += f",\n\tVECTOR INDEX {sparse_vidx.index_name}({sparse_vidx.field_name}) with (type={sparse_params['type']}, distance=inner_product)"
+                        else:
+                            new_sql += f",\n\tVECTOR INDEX {sparse_vidx.index_name}({sparse_vidx.field_name}) with (distance=inner_product)"
                     new_sql += "\n)"
                     conn.execute(text(new_sql))
                 else:

pyobvector/client/ob_vec_json_table_client.py

@@ -817,11 +817,12 @@ class ObVecJsonTableClient(ObVecClient):
     ):
         real_user_id = opt_user_id or self.user_id
 
-        table_name = ast.args['from'].this.this.this
+        from_key = 'from_' if 'from_' in ast.args else 'from'
+        table_name = ast.args[from_key].this.this.this
         if not self._check_table_exists(table_name):
             raise ValueError(f"Table {table_name} does not exists")
         
-        ast.args['from'].args['this'].args['this'] = to_identifier(name=JSON_TABLE_DATA_TABLE_NAME, quoted=False)
+        ast.args[from_key].args['this'].args['this'] = to_identifier(name=JSON_TABLE_DATA_TABLE_NAME, quoted=False)
 
         col_meta = self.jmetadata.meta_cache[table_name]
         json_table_meta_str = []

{pyobvector-0.2.19.dist-info → pyobvector-0.2.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobvector
-Version: 0.2.19
+Version: 0.2.20
 Summary: A python SDK for OceanBase Vector Store, based on SQLAlchemy, compatible with Milvus API.
 License-File: LICENSE
 Author: shanhaikang.shk
@@ -38,7 +38,7 @@ poetry install
 - install with pip:
 
 ```shell
-pip install pyobvector==0.2.19
+pip install pyobvector==0.2.20
 ```
 
 ## Build Doc
@@ -234,17 +234,17 @@ res = self.client.ann_search(
 The `ann_search` method supports flexible output column selection through the `output_columns` parameter:
 
 - **`output_columns`** (recommended): Accepts SQLAlchemy Column objects, expressions, or a mix of both
-
+  
   - Column objects: `table.c.id`, `table.c.name`
   - Expressions: `(table.c.age + 10).label('age_plus_10')`
   - JSON queries: `text("JSON_EXTRACT(meta, '$.key') as extracted_key")`
   - String functions: `func.concat(table.c.name, ' (', table.c.age, ')').label('name_age')`
 - **`output_column_names`** (legacy): Accepts list of column name strings
-
+  
   - Example: `['id', 'name', 'meta']`
 - **Parameter Priority**: `output_columns` takes precedence over `output_column_names` when both are provided
 - **`distance_threshold`** (optional): Filter results by distance threshold
-
+  
   - Type: `Optional[float]`
   - Only returns results where `distance <= threshold`
   - Example: `distance_threshold=0.5` returns only results with distance <= 0.5
@@ -454,3 +454,4 @@ sql = client.get_sql(index=test_table_name, body=body)
 print(sql)  # prints the SQL query
 ```
 
+

{pyobvector-0.2.19.dist-info → pyobvector-0.2.20.dist-info}/RECORD

@@ -4,12 +4,12 @@ pyobvector/client/collection_schema.py,sha256=a7JQk83ZxMsvMDGt5CC_4lz2-skONqKgk-
 pyobvector/client/enum.py,sha256=3lPjSltITSE694-qOAP4yoX6fzCjKD4WAewmIxFs49o,139
 pyobvector/client/exceptions.py,sha256=CjoquSCc0H705MtvhpQW_F7_KaviYrKAHkndpF8sJx4,3777
 pyobvector/client/fts_index_param.py,sha256=UvU82p9_x444WAQMqhIUPHbqVHV5B3cFazje1Gw-slo,1105
-pyobvector/client/hybrid_search.py,sha256=xuD3CJh4jxm9EFjee6sx7zDGogvQT0qTni79F9Url7Q,2840
-pyobvector/client/index_param.py,sha256=Dg-FEFQPBRxb7qXChqoLgBSljpdJzF-C7ESUbG9x1mA,6926
+pyobvector/client/hybrid_search.py,sha256=wXHu4iOBRyVuMByiH3XyB4kKYqvzmVBSSiod5lj7cVY,2571
+pyobvector/client/index_param.py,sha256=Tbu_-qg4SIXIzn1qpTg8Zl1L_RCXCUAEsZPKsA0LsNY,7062
 pyobvector/client/milvus_like_client.py,sha256=jHxB-ZmIGZiIDxEpurSlAKffiCF_KFNZP-14_vq1RQM,27887
-pyobvector/client/ob_client.py,sha256=csSRVWqbhnsaN2gj7FSwL7QExh4vbTx6EyqPznKRSz4,16172
-pyobvector/client/ob_vec_client.py,sha256=P6IMtsYxS_S78VsQtltK3UenW91iYfRKa0s1hIc8CI0,19916
-pyobvector/client/ob_vec_json_table_client.py,sha256=rq80AfqAKhosLcrBFROAoINVSkr-48xlRH91Jt4pEwA,39246
+pyobvector/client/ob_client.py,sha256=xfLbkTJrrmKArUJSLyfUcI_CsMk26KLB2DVFb6Y1-OQ,16987
+pyobvector/client/ob_vec_client.py,sha256=jtAs2pB987zYfwyFgaipv8TgYsDfiFqeBDU7PKiUFbs,20241
+pyobvector/client/ob_vec_json_table_client.py,sha256=YwAKG1pGAYgbhaYB6wDCdxB6L4uJcXCHCwLTy99ZirY,39312
 pyobvector/client/partitions.py,sha256=Bxwr5yVNlXwZc7SXBC03NeqL9giy4Fe6S2qZdHD8xGw,15621
 pyobvector/client/schema_type.py,sha256=gH2YiBsgkryo-R0GB_NYuRXMvzvrSjOamZTy6pwn2n0,1673
 pyobvector/json_table/__init__.py,sha256=X5MmK3f10oyJleUUFZJFeunMEfzmf6P1f_7094b-FZc,554
@@ -34,7 +34,7 @@ pyobvector/util/__init__.py,sha256=-opvZ4Ya0ByTAhls06547-zW3vkdYRkUH6W5OCKUHD4,3
 pyobvector/util/ob_version.py,sha256=cWkQWoJkIxG6OEF9-gBwJK8LUorltHuKSVAb_NFkpdE,1542
 pyobvector/util/sparse_vector.py,sha256=1IG0CRYfC2z39nGwuG43TImQkWiuPAXOlOnYqJ1hA-o,1275
 pyobvector/util/vector.py,sha256=58glSQqjOSTrGyNhUEIrs9r4F9oaYO_SdPNhMfbSnWs,2392
-pyobvector-0.2.19.dist-info/METADATA,sha256=9r91zFxzOPl3zzhSy521IZKsVWl0oXXzVx7ELQFjsV4,14310
-pyobvector-0.2.19.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-pyobvector-0.2.19.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-pyobvector-0.2.19.dist-info/RECORD,,
+pyobvector-0.2.20.dist-info/METADATA,sha256=f8EONRGcUmb7zDKtSU6R-axq16x4SKLh4okd9vwT5Cg,14317
+pyobvector-0.2.20.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyobvector-0.2.20.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+pyobvector-0.2.20.dist-info/RECORD,,