mirror of
https://github.com/qdrant/qdrant-client.git
synced 2026-07-23 11:11:01 -05:00
* new: remove vectors_count, update http and grpc models * fix: update inspection cache * new: add conversions and update interface * fix: fix some conversions * fix: fix typo * fix: fix isinstance * fix: regen async * fix: fix update_filter usage, fix isinstance * tests: collection metadata test * fix: address backward compatibility in test * new: update models, add max payload index count and copy vectors * fix; update _inspection_cache * new: add read consistency to count points * Allow uuids in interface (#1085) * new: direct uuid support * tests: add uuid tests * fix: update inspection cache * new: add collection metadata and tests to local mode (#1089) * new: add collection metadata and tests to local mode * fix: regen async client * new: implement parametrized rrf in local mode (#1087) * new: implement parametrized rrf in local mode * refactoring: use a variable for a magic value * fix: adjust conversion according to AI * Update filter (#1090) * new: add missing update_filter, implement it in local mode * fix: fix type hint, fix update operation, fix rest uploader, add tests * fix: fix update filter is None case * fix: mypy was not a good boy * Text any filter (#1091) * new: add match text any local mode * tests: add match text any tests * new: update models, remove init_from and locks (#1100) * new: update models, remove init_from and locks * deprecate: remove init from tests * deprecate: remove lock tests * new: convert ascii_folding * fix: fix type stub * new: convert acorn * new: convert shard key with fallback * new: update grpcio and grpcio tools in generator (#1106) * new: update grpcio and grpcio tools in generator * fix: bind grpcio and tools versions to 1.62.0 in generator * Remove deprecated methods (#1103) * deprecate: remove old api methods * deprecate: remove type stub for removed methods * deprecate: remove old api methods from test_qdrant_client * deprecate: replace search with query points in test_in_memory * deprecate: replace search methods in fastembed mixin with query points * deprecate: replace old api methods in test async qdrant client * deprecate: replace search with query points in test delete points * deprecate: replace discover and context with query points in test_discovery * deprecate: replace recommend_groups with query_points_groups in test_group_recommend * deprecate: replace search_groups in test_group_search * deprecate: replace recommend with query points in test_recommendation * deprecate: replace search with query points in test search * deprecate: replace context and discover with query points in test sparse discovery * deprecate: replace search with query points in test sparse idf search * deprecate: replace recommend with query points in test sparse recommend * deprecate: replace search with query points in test sparse search * deprecate: replace missing search request with query request in qdrant_fastembed * deprecate: replace search with query points in test multivector search queries * deprecate: replace upload records with upload points in test_updates * deprecate: remove redundant structs (#1104) * deprecate: remove redundant structs * fix: do not use removed conversions in local mode * fix: remove redundant conversions, simplify types.QueryRequest * deprecate: replace old style grpc vector conversion to a new one (#1105) * deprecate: replace old style grpc vector conversion to a new one * fix: ignore union attr in conversion * review fixes --------- Co-authored-by: generall <andrey@vasnetsov.com> --------- Co-authored-by: generall <andrey@vasnetsov.com> --------- Co-authored-by: generall <andrey@vasnetsov.com> * new: deprecate add, query, query_batch in fastembed mixin (#1102) * new: deprecate add, query, query_batch in fastembed mixin * 1.16 -> 1.17 --------- Co-authored-by: generall <andrey@vasnetsov.com> --------- Co-authored-by: generall <andrey@vasnetsov.com> * new: yet another update * new: add initial_state to create shard key (#1109) * new: drop python3.9, replace union and optional with | where possible * fix: fix missing type hints, regen async * fix: remove redundant optional * fix: fix ai comments * fix: update type hints from merge * new: update pyproject and lock * new: replace optional and union with | * new: remove optional and union from qdrant local * new: replace union with | in client classes * fix: replace remaining union, optional, etc, address review comments * new: adjust numpy versioning --------- Co-authored-by: generall <andrey@vasnetsov.com>
151 lines
3.8 KiB
Python
151 lines
3.8 KiB
Python
from enum import Enum
|
|
|
|
from pydantic import BaseModel
|
|
|
|
|
|
class JsonPathItemType(str, Enum):
|
|
KEY = "key"
|
|
INDEX = "index"
|
|
WILDCARD_INDEX = "wildcard_index"
|
|
|
|
|
|
class JsonPathItem(BaseModel):
|
|
item_type: JsonPathItemType
|
|
index: int | None = (
|
|
None # split into index and key instead of using Union, because pydantic coerces
|
|
)
|
|
# int to str even in case of Union[int, str]. Tested with pydantic==1.10.14
|
|
key: str | None = None
|
|
|
|
|
|
def parse_json_path(key: str) -> list[JsonPathItem]:
|
|
"""Parse and validate json path
|
|
|
|
Args:
|
|
key: json path
|
|
|
|
Returns:
|
|
list[JsonPathItem]: json path split into separate keys
|
|
|
|
Raises:
|
|
ValueError: if json path is invalid or empty
|
|
|
|
Examples:
|
|
|
|
# >>> parse_json_path("a[0][1].b")
|
|
# [
|
|
# JsonPathItem(item_type=<JsonPathItemType.KEY: 'key'>, value='a'),
|
|
# JsonPathItem(item_type=<JsonPathItemType.INDEX: 'index'>, value=0),
|
|
# JsonPathItem(item_type=<JsonPathItemType.INDEX: 'index'>, value=1),
|
|
# JsonPathItem(item_type=<JsonPathItemType.KEY: 'key'>, value='b')
|
|
# ]
|
|
"""
|
|
keys = []
|
|
json_path = key
|
|
while json_path:
|
|
json_path_item, rest = match_quote(json_path)
|
|
if json_path_item is None:
|
|
json_path_item, rest = match_key(json_path)
|
|
|
|
if json_path_item is None:
|
|
raise ValueError("Invalid path")
|
|
|
|
keys.append(json_path_item)
|
|
brackets_chunks, rest = match_brackets(rest)
|
|
keys.extend(brackets_chunks)
|
|
json_path = trunk_sep(rest)
|
|
if not json_path:
|
|
return keys
|
|
continue
|
|
|
|
raise ValueError("Invalid path")
|
|
|
|
|
|
def trunk_sep(path: str) -> str:
|
|
if not path:
|
|
return path
|
|
|
|
if len(path) == 1:
|
|
raise ValueError("Invalid path")
|
|
|
|
if path.startswith("."):
|
|
return path[1:]
|
|
|
|
elif path.startswith("["):
|
|
return path
|
|
else:
|
|
raise ValueError("Invalid path")
|
|
|
|
|
|
def match_quote(path: str) -> tuple[JsonPathItem | None, str]:
|
|
if not path.startswith('"'):
|
|
return None, path
|
|
|
|
left_quote_pos = 0
|
|
right_quote_pos = path.find('"', 1)
|
|
|
|
if path.count('"') < 2:
|
|
raise ValueError("Invalid path")
|
|
|
|
return (
|
|
JsonPathItem(
|
|
item_type=JsonPathItemType.KEY, key=path[left_quote_pos + 1 : right_quote_pos]
|
|
),
|
|
path[right_quote_pos + 1 :],
|
|
)
|
|
|
|
|
|
def match_key(path: str) -> tuple[JsonPathItem | None, str]:
|
|
char_counter = 0
|
|
for char in path:
|
|
if not char.isalnum() and char not in ["_", "-"]:
|
|
break
|
|
char_counter += 1
|
|
if char_counter == 0:
|
|
return None, path
|
|
|
|
return (
|
|
JsonPathItem(item_type=JsonPathItemType.KEY, key=path[:char_counter]),
|
|
path[char_counter:],
|
|
)
|
|
|
|
|
|
def match_brackets(rest: str) -> tuple[list[JsonPathItem], str]:
|
|
keys = []
|
|
|
|
while rest:
|
|
json_path_item, rest = _match_brackets(rest)
|
|
|
|
if json_path_item is None:
|
|
break
|
|
|
|
keys.append(json_path_item)
|
|
|
|
return keys, rest
|
|
|
|
|
|
def _match_brackets(path: str) -> tuple[JsonPathItem | None, str]:
|
|
if "[" not in path or not path.startswith("["):
|
|
return None, path
|
|
|
|
left_bracket_pos = 0
|
|
right_bracket_pos = path.find("]", left_bracket_pos + 1)
|
|
|
|
if right_bracket_pos == -1:
|
|
raise ValueError("Invalid path")
|
|
|
|
if right_bracket_pos == (left_bracket_pos + 1):
|
|
return (
|
|
JsonPathItem(item_type=JsonPathItemType.WILDCARD_INDEX),
|
|
path[right_bracket_pos + 1 :],
|
|
)
|
|
|
|
try:
|
|
index = int(path[left_bracket_pos + 1 : right_bracket_pos])
|
|
return (
|
|
JsonPathItem(item_type=JsonPathItemType.INDEX, index=index),
|
|
path[right_bracket_pos + 1 :],
|
|
)
|
|
except ValueError as e:
|
|
raise ValueError("Invalid path") from e
|