infinity-sdk 0.7.2__tar.gz → 0.7.3__tar.gz

{infinity_sdk-0.7.2/python/infinity_sdk/infinity_sdk.egg-info → infinity_sdk-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infinity-sdk
-Version: 0.7.2
+Version: 0.7.3
 Summary: infinity
 License-Expression: Apache-2.0
 Requires-Python: <3.14,>=3.11
@@ -97,7 +97,7 @@ Infinity supports two working modes, embedded mode and client-server mode. The f
 
 2. Install the `infinity-sdk` package:
    ```bash
-   pip install infinity-sdk==0.7.2
+   pip install infinity-sdk==0.7.3
    ```
 
 3. Use Infinity to conduct a dense vector search:

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/README.md

@@ -96,7 +96,7 @@ If you are on Windows 10+, you must enable WSL or WSL2 to deploy Infinity using
 ### Install Infinity client
 
 ```
-pip install infinity-sdk==0.7.2
+pip install infinity-sdk==0.7.3
 ```
 
 ### Run a vector search

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "infinity-sdk"
-version = "0.7.2"
+version = "0.7.3"
 description = "infinity"
 readme = "python/infinity_sdk/README.md"
 license = "Apache-2.0"
@@ -71,6 +71,55 @@ filterwarnings = [
     'ignore:function ham\(\) is deprecated:DeprecationWarning',
 ]
 
+[tool.ruff.lint]
+ignore = [
+    "RUF059",
+    "UP031",
+    "LOG015",
+    "BLE001",
+    "TRY002",
+    "B006",
+    "B023",
+    "S110",
+    "RUF012",
+    "RUF013",
+    "B017",
+    "C408",
+    "TRY201",
+    "SIM103",
+    "TRY203",
+    "SIM115",
+    "SIM118",
+    "EXE001",
+    "PT014",
+    "PLW0602",
+    "PERF402",
+    "PLR1722",
+    "PLW1510",
+    "SIM102",
+    "UP007",
+    "FURB132",
+    "SIM113",
+    "TRY004",
+    "B015",
+    "DTZ001",
+    "PERF102",
+    "PLW0127",
+    "SIM101",
+    "SIM210",
+    "UP022",
+    "B008",
+    "C417",
+    "C418",
+    "DTZ005",
+    "ISC004",
+    "N999",
+    "PLR0133",
+    "RUF015",
+    "SIM117",
+    "SIM211",
+]
+
 [tool.ruff.lint.per-file-ignores]
 "python/infinity_embedded/local_infinity/client.py" = ["F403", "F405"]
 "python/infinity_embedded/local_infinity/query_builder.py" = ["F403", "F405"]

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/README.md

@@ -63,7 +63,7 @@ Infinity supports two working modes, embedded mode and client-server mode. The f
 
 2. Install the `infinity-sdk` package:
    ```bash
-   pip install infinity-sdk==0.7.2
+   pip install infinity-sdk==0.7.3
    ```
 
 3. Use Infinity to conduct a dense vector search:

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/__init__.py

@@ -17,17 +17,30 @@
 # __version__ = importlib.metadata.version("infinity_sdk")
 
 import logging
+
 # import pkg_resources
 # __version__ = pkg_resources.get_distribution("infinity_sdk").version
-
-from infinity.common import URI, NetworkAddress, LOCAL_HOST, LOCAL_INFINITY_PATH, InfinityException
+from infinity.common import (
+    LOCAL_HOST,
+    LOCAL_INFINITY_PATH,
+    URI,
+    InfinityException,
+    NetworkAddress,
+)
+from infinity.errors import ErrorCode
 from infinity.infinity import InfinityConnection
 from infinity.remote_thrift.infinity import RemoteThriftInfinityConnection
-from infinity.errors import ErrorCode
 
 __all__ = [
-    "URI", "NetworkAddress", "LOCAL_HOST", "LOCAL_INFINITY_PATH", "InfinityException",
-    "InfinityConnection", "RemoteThriftInfinityConnection", "ErrorCode", "connect"
+    "LOCAL_HOST",
+    "LOCAL_INFINITY_PATH",
+    "URI",
+    "ErrorCode",
+    "InfinityConnection",
+    "InfinityException",
+    "NetworkAddress",
+    "RemoteThriftInfinityConnection",
+    "connect"
 ]
 
 

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/common.py

@@ -11,9 +11,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Union
-from dataclasses import dataclass, field
+
 import numpy as np
 
 
@@ -102,13 +103,13 @@ LOCAL_HOST = NetworkAddress("127.0.0.1", 23817)
 LOCAL_INFINITY_PATH = "/var/infinity"
 
 
-class ConflictType(object):
+class ConflictType:
     Ignore = 0
     Error = 1
     Replace = 2
 
 
-class SortType(object):
+class SortType:
     Asc = 0
     Desc = 1
 

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/connection_pool.py

@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
 from threading import Lock
+
 import infinity
 from infinity.common import NetworkAddress
-import logging
 
 
-class ConnectionPool(object):
+class ConnectionPool:
     def __init__(self, uri=NetworkAddress("127.0.0.1", 23817), max_size=16):
         self.uri_ = uri
         self.max_size_ = max_size

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/http_utils.py

@@ -1,6 +1,7 @@
 import ast
 import re
 from enum import Enum
+
 from infinity.common import ConflictType
 from infinity.table import ExplainType
 

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/index.py

@@ -14,11 +14,12 @@
 
 from enum import Enum
 
-import infinity.remote_thrift.infinity_thrift_rpc.ttypes as ttypes
+from sqlglot import maybe_parse
+
 from infinity.common import InfinityException
 from infinity.errors import ErrorCode
+from infinity.remote_thrift.infinity_thrift_rpc import ttypes
 from infinity.remote_thrift.utils import parse_expr
-from sqlglot import maybe_parse
 
 
 class IndexType(Enum):

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/infinity.py

@@ -14,7 +14,6 @@
 from abc import ABC, abstractmethod
 
 
-
 # abstract class
 class InfinityConnection(ABC):
     def __init__(self, uri):

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/infinity_http.py

@@ -1,28 +1,45 @@
+import ast
+import logging
 import re
 import time
+from collections import namedtuple
+from dataclasses import dataclass
+from typing import Any
 
-import requests
-import logging
-import ast
-from numpy import dtype
-from .http_utils import (
-    baseHeader, baseResponse, baseData, default_url, baseCreateOptions, baseDropOptions,
-    index_type_transfrom, ExplainType_transfrom, is_list, is_date, is_time, is_datetime,
-    is_sparse, str2sparse, type_to_dtype, function_return_type, is_float, functions, bool_functions
-)
-
-from infinity.common import ConflictType, InfinityException, SparseVector, SortType, FDE
-from typing import Optional, Any
-from infinity.errors import ErrorCode
-from infinity.utils import deprecated_api
 import numpy as np
 import pandas as pd
 import polars as pl
 import pyarrow as pa
+import requests
+from numpy import dtype
+
+from infinity.common import FDE, ConflictType, InfinityException, SortType, SparseVector
+from infinity.errors import ErrorCode
 from infinity.table import ExplainType
-from typing import List
-from dataclasses import dataclass
-from collections import namedtuple
+from infinity.utils import deprecated_api
+
+from .http_utils import (
+    ExplainType_transfrom,
+    baseCreateOptions,
+    baseData,
+    baseDropOptions,
+    baseHeader,
+    baseResponse,
+    bool_functions,
+    default_url,
+    function_return_type,
+    functions,
+    index_type_transfrom,
+    is_date,
+    is_datetime,
+    is_float,
+    is_list,
+    is_sparse,
+    is_time,
+    str2sparse,
+    type_to_dtype,
+)
+
 
 def is_json_function(col_name: str) -> bool:
     """Check if column name is a JSON extraction function"""
@@ -40,7 +57,7 @@ def is_json_function(col_name: str) -> bool:
     return any(col_name_lower.startswith(func) for func in json_functions)
 
 
-def _parse_cast_target_type(cast_expr: str) -> Optional[str]:
+def _parse_cast_target_type(cast_expr: str) -> str | None:
     if not cast_expr.lower().startswith("cast("):
         return None
 
@@ -180,7 +197,6 @@ class http_network_util:
                 pass
 
         logging.debug("----------------------------------------------")
-        return
 
     def get_database_result(self, resp, expect={}):
         try:
@@ -1044,7 +1060,7 @@ class table_http_result:
         self._highlight = highlight
         return self
 
-    def sort(self, order_by_expr_list: Optional[List[list[str, SortType]]]):
+    def sort(self, order_by_expr_list: list[list[str, SortType]] | None):
         for order_by_expr in order_by_expr_list:
             tmp = {}
             if len(order_by_expr) != 2:
@@ -1084,7 +1100,7 @@ class table_http_result:
         self._option = option
         return self
 
-    def match_text(self, fields: str, query: str, topn: int, opt_params: Optional[dict] = None):
+    def match_text(self, fields: str, query: str, topn: int, opt_params: dict | None = None):
         tmp_match_expr = {"match_method": "text", "fields": fields, "matching_text": query, "topn": topn}
         if opt_params is not None:
             tmp_match_expr["params"] = opt_params
@@ -1096,7 +1112,7 @@ class table_http_result:
         return self.match_text(*args, **kwargs)
 
     def match_tensor(self, column_name: str, query_data, query_data_type: str, topn: int,
-                     extra_option: Optional[dict] = None):
+                     extra_option: dict | None = None):
         tmp_match_tensor = {"match_method": "tensor", "field": column_name, "query_tensor": query_data,
                             "element_type": query_data_type, "topn": topn}
         if extra_option is not None:
@@ -1105,7 +1121,7 @@ class table_http_result:
         return self
 
     def match_sparse(self, vector_column_name: str, sparse_data: SparseVector | dict, distance_type: str, topn: int,
-                     opt_params: Optional[dict] = None):
+                     opt_params: dict | None = None):
         tmp_match_sparse = {"match_method": "sparse", "fields": vector_column_name,
                             "query_vector": sparse_data.to_dict(), "metric_type": distance_type, "topn": topn}
         if opt_params is not None:
@@ -1118,7 +1134,7 @@ class table_http_result:
         return self
 
     def match_dense(self, fields: str, query_vector: list, element_type: str, metric_type: str, top_k: int,
-                    opt_params: Optional[dict] = None):
+                    opt_params: dict | None = None):
         tmp_match_dense = {"match_method": "dense", "fields": fields, "query_vector": query_vector,
                            "element_type": element_type, "metric_type": metric_type, "topn": top_k}
         if opt_params is not None:
@@ -1130,7 +1146,7 @@ class table_http_result:
         deprecated_api("knn is deprecated, please use match_dense instead")
         return self.match_dense(*args, **kwargs)
 
-    def fusion(self, method: str, topn: int, fusion_params: Optional[dict] = None):
+    def fusion(self, method: str, topn: int, fusion_params: dict | None = None):
         tmp_fusion_expr = {"fusion_method": method, "topn": topn}
         if method == "match_tensor":
             tmp_new_params = {"field": fusion_params["field"], "query_tensor": fusion_params["query_tensor"],
@@ -1184,18 +1200,12 @@ class table_http_result:
                 if len(tup) == line_i + 1:
                     continue
 
-                if v is None:
-                    new_tup = tup + (v,)
-                elif isinstance(v, (int, float)):
+                if v is None or isinstance(v, (int, float)):
                     new_tup = tup + (v,)
                 elif is_list(v) and not is_json_function(col_name):
                     # Don't parse lists for JSON extraction functions - keep them as strings
                     new_tup = tup + (ast.literal_eval(v),)
-                elif is_date(v):
-                    new_tup = tup + (v,)
-                elif is_time(v):
-                    new_tup = tup + (v,)
-                elif is_datetime(v):
+                elif is_date(v) or is_time(v) or is_datetime(v):
                     new_tup = tup + (v,)
                 elif is_sparse(v):  # sparse vector
                     sparse_vec = str2sparse(v)
@@ -1312,7 +1322,7 @@ class table_http_result:
 
 
 @dataclass
-class database_result():
+class database_result:
     def __init__(self, list=[], database_name: str = "", error_code=ErrorCode.OK, columns=[], index_names=[],
                  node_name="", node_role="", node_status="", index_type=None, index_comment=None, deleted_rows=0,
                  data={}, nodes=[], error_msg="", snapshots=[], config_value: Any = None):

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/rag_tokenizer.py

@@ -25,7 +25,6 @@
 # ]
 # ///
 
-import logging
 # logging.basicConfig(
 #     level=logging.INFO,
 #     format='%(asctime)s - %(levelname)s - %(message)s',
@@ -33,16 +32,17 @@ import logging
 # )
 import argparse
 import copy
-import datrie
+import logging
 import math
 import os
 import re
 import string
+
+import datrie
 from hanziconv import HanziConv
 from nltk import word_tokenize
 from nltk.stem import SnowballStemmer, WordNetLemmatizer
 
-
 # Map language names (lowercase) to NLTK SnowballStemmer language names.
 # Used by set_language() to configure language-specific stemming.
 _SNOWBALL_LANGUAGE_MAP = {
@@ -307,7 +307,7 @@ class RagTokenizer:
             tks.append(tk)
         # F /= len(tks)
         L /= len(tks)
-        logging.debug("[SC] {} {} {} {} {}".format(tks, len(tks), L, F, B / len(tks) + L + F))
+        logging.debug(f"[SC] {tks} {len(tks)} {L} {F} {B / len(tks) + L + F}")
         return tks, B / len(tks) + L + F
 
     def _sort_tokens(self, tkslist):
@@ -439,8 +439,8 @@ class RagTokenizer:
             tks, s = self._max_forward(L)
             tks1, s1 = self._max_backward(L)
             if self.DEBUG:
-                logging.debug("[FW] {} {}".format(tks, s))
-                logging.debug("[BW] {} {}".format(tks1, s1))
+                logging.debug(f"[FW] {tks} {s}")
+                logging.debug(f"[BW] {tks1} {s1}")
 
             i, j, _i, _j = 0, 0, 0, 0
             same = 0
@@ -488,7 +488,7 @@ class RagTokenizer:
                 res.append(" ".join(self._sort_tokens(tkslist)[0][0]))
 
         res = " ".join(res)
-        logging.debug("[TKS] {}".format(self.merge_(res)))
+        logging.debug(f"[TKS] {self.merge_(res)}")
         return self.merge_(res)
 
     def fine_grained_tokenize(self, tks: str) -> str:
@@ -626,7 +626,7 @@ if __name__ == '__main__':
             results.append(result)
 
         except Exception as e:
-            error_msg = f"ERROR: {str(e)}"
+            error_msg = f"ERROR: {e!s}"
             logging.error(f"Failed to process text: {text} - {e}")
             results.append(error_msg)
 

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/remote_thrift/client.py

@@ -14,31 +14,72 @@
 
 import logging
 from functools import wraps
-from readerwriterlock import rwlock
 
+from readerwriterlock import rwlock
 from thrift.protocol import TBinaryProtocol
 from thrift.transport import TSocket, TTransport
 from thrift.transport.TTransport import TTransportException
 
 from infinity import URI
-from infinity.remote_thrift.infinity_thrift_rpc import InfinityService
+from infinity.common import InfinityException
+from infinity.errors import ErrorCode
+from infinity.remote_thrift.infinity_thrift_rpc import InfinityService, ttypes
 from infinity.remote_thrift.infinity_thrift_rpc.ttypes import (
-    SelectRequest, ExplainRequest, DeleteRequest, UpdateRequest, CommonResponse, CommonRequest,
-    ShowSegmentsRequest, ShowSegmentRequest, ShowBlocksRequest, ShowBlockRequest, ShowBlockColumnRequest,
-    ShowCurrentNodeRequest, OptimizeRequest, AlterIndexRequest, AddColumnsRequest, DropColumnsRequest,
-    DumpIndexRequest, CreateTableSnapshotRequest, CreateDatabaseSnapshotRequest,
-    CreateSystemSnapshotRequest, RestoreSnapshotRequest, ListSnapshotsRequest, ShowSnapshotRequest,
-    DropSnapshotRequest, ConfigValue, SetConfigRequest, ShowConfigRequest,
+    AddColumnsRequest,
+    AlterIndexRequest,
+    CommonRequest,
+    CommonResponse,
     CompactRequest,
-    ConnectRequest, CreateConflict, CreateOption, DropConflict, DropOption,
-    CreateDatabaseRequest, DropDatabaseRequest, ListDatabaseRequest, ShowDatabaseRequest, GetDatabaseRequest,
-    CreateTableRequest, DropTableRequest, RenameTableRequest, ListTableRequest, ShowTableRequest, ShowColumnsRequest,
-    GetTableRequest, IndexInfo, CreateIndexRequest, DropIndexRequest, ShowIndexRequest, ListIndexRequest,
-    Field, InsertRequest, ImportRequest, ExportRequest
+    ConfigValue,
+    ConnectRequest,
+    CreateConflict,
+    CreateDatabaseRequest,
+    CreateDatabaseSnapshotRequest,
+    CreateIndexRequest,
+    CreateOption,
+    CreateSystemSnapshotRequest,
+    CreateTableRequest,
+    CreateTableSnapshotRequest,
+    DeleteRequest,
+    DropColumnsRequest,
+    DropConflict,
+    DropDatabaseRequest,
+    DropIndexRequest,
+    DropOption,
+    DropSnapshotRequest,
+    DropTableRequest,
+    DumpIndexRequest,
+    ExplainRequest,
+    ExportRequest,
+    Field,
+    GetDatabaseRequest,
+    GetTableRequest,
+    ImportRequest,
+    IndexInfo,
+    InsertRequest,
+    ListDatabaseRequest,
+    ListIndexRequest,
+    ListSnapshotsRequest,
+    ListTableRequest,
+    OptimizeRequest,
+    RenameTableRequest,
+    RestoreSnapshotRequest,
+    SelectRequest,
+    SetConfigRequest,
+    ShowBlockColumnRequest,
+    ShowBlockRequest,
+    ShowBlocksRequest,
+    ShowColumnsRequest,
+    ShowConfigRequest,
+    ShowCurrentNodeRequest,
+    ShowDatabaseRequest,
+    ShowIndexRequest,
+    ShowSegmentRequest,
+    ShowSegmentsRequest,
+    ShowSnapshotRequest,
+    ShowTableRequest,
+    UpdateRequest,
 )
-import infinity.remote_thrift.infinity_thrift_rpc.ttypes as ttypes
-from infinity.errors import ErrorCode
-from infinity.common import InfinityException
 
 TRY_TIMES = 10
 
@@ -123,8 +164,9 @@ class ThriftInfinityClient:
         # version: 0.6.8 and 0.6.9 and 0.6.10, client_version: 33
         # version: 0.6.13, client_version: 34
         # version: 0.6.15, client_version: 35
-        # version: 0.7.0, 0.7.1, 0.7.2 client_version: 36
-        res = self.client.Connect(ConnectRequest(client_version=36))  # 0.7.2
+        # version: 0.7.0, 0.7.1, 0.7.2, client_version: 36
+        # version: 0.7.3, client_version: 37
+        res = self.client.Connect(ConnectRequest(client_version=37))  # 0.7.3
         if res.error_code != 0:
             raise InfinityException(res.error_code, res.error_msg)
         self.session_id = res.session_id
@@ -144,7 +186,7 @@ class ThriftInfinityClient:
                             self._reconnect()
                             self.session_i += 1
                             self.logger.debug(
-                                f"Tried {i} times, session_id: {self.session_id}, session_i: {self.session_i}, exception: {str(e)}")
+                                f"Tried {i} times, session_id: {self.session_id}, session_i: {self.session_i}, exception: {e!s}")
                 except Exception:
                     raise
             else:

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/remote_thrift/db.py

@@ -14,17 +14,16 @@
 
 from abc import ABC
 
-import infinity.remote_thrift.infinity_thrift_rpc.ttypes as ttypes
+from infinity.common import ConflictType, InfinityException
 from infinity.db import Database
 from infinity.errors import ErrorCode
+from infinity.remote_thrift.infinity_thrift_rpc import ttypes
 from infinity.remote_thrift.table import RemoteTable
 from infinity.remote_thrift.utils import (
     check_valid_name,
-    name_validity_check,
     get_ordinary_info,
+    name_validity_check,
 )
-from infinity.common import ConflictType
-from infinity.common import InfinityException
 
 
 class RemoteDatabase(Database, ABC):

{infinity_sdk-0.7.2 → infinity_sdk-0.7.3}/python/infinity_sdk/infinity/remote_thrift/infinity.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from abc import ABC
 import logging
+from abc import ABC
+from dataclasses import dataclass
+from typing import Any
 
-import infinity.remote_thrift.infinity_thrift_rpc.ttypes as ttypes
 from infinity import InfinityConnection
+from infinity.common import ConflictType, InfinityException
 from infinity.errors import ErrorCode
 from infinity.remote_thrift.client import ThriftInfinityClient
 from infinity.remote_thrift.db import RemoteDatabase
+from infinity.remote_thrift.infinity_thrift_rpc import ttypes
 from infinity.remote_thrift.utils import name_validity_check
-from infinity.common import ConflictType, InfinityException
-from typing import Any
-from dataclasses import dataclass
 
 
 @dataclass