Skip to content

Commit 9813221

Browse files
committed
add makefile dev.md && add test_case fix kann_search
Signed-off-by: weedge <[email protected]>
1 parent f5a2665 commit 9813221

File tree

6 files changed

+59
-8
lines changed

6 files changed

+59
-8
lines changed

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
3+
init:
4+
pip3 install twine pytest
5+
6+
pypi_deploy:
7+
@rm -rf dist && python3 setup.py sdist bdist_wheel
8+
@twine upload --verbose --skip-existing dist/*
9+
10+
local_setup:
11+
@pip3 uninstall redisx -y
12+
@rm -rf dist && python3 setup.py install

docs/dev.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## dev
2+
```shell
3+
pip3 uninstall redisx
4+
python3 setup.py install
5+
# run python example like this
6+
python3 examples/ann_usearch.py
7+
```
8+
9+
## deploy
10+
1. need register pypi user [https://pypi.org/](https://pypi.org/)
11+
2. install `twine`, `pip3 install twine`, add token conf to `~/.pypirc`
12+
```shell
13+
[pypi]
14+
username = __token__
15+
password = {your token}
16+
```
17+
3. change `setup.py` version, then deploy
18+
```shell
19+
rm -rf dist && python3 setup.py sdist bdist_wheel
20+
twine upload --verbose --skip-existing dist/*
21+
```

examples/ann_usearch.py

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
from conf_cases import get_client, get_random_vectors
2+
from conf_cases import get_client, get_random_vectors, test_vector
33
from redis import ResponseError
44
from redisx.define import UsearchQuantizationType
55

@@ -129,8 +129,17 @@ def kann_search(index_name: str, k: int, query_vector: []):
129129
return False
130130

131131

132-
if __name__ == "__main__":
133-
dim = 4
132+
def test_case():
133+
print("delete_index res {}".format(delete_index("test_case0")))
134+
print("create_index res {}".format(create_index("test_case0", 1024)))
135+
print(add_vector("test_case0", "c0", test_vector))
136+
# print(get_vector("test_case0", "c0"))
137+
print(kann_search("test_case0", 1, test_vector))
138+
print("delete_index res {}".format(delete_index("test_case0")))
139+
140+
141+
def example_all():
142+
dim = 10
134143

135144
print("delete_index res {}".format(delete_index("test_idx0")))
136145
print("create_index res {}".format(create_index("test_idx0", dim)))
@@ -148,12 +157,12 @@ def kann_search(index_name: str, k: int, query_vector: []):
148157
print("del_vector_id res {}".format(del_vector_id("test_idx0", i)))
149158

150159
print("\n======= kann search =====\n")
151-
for i, vector in enumerate(get_random_vectors(dim, 100)):
160+
for i, vector in enumerate(get_random_vectors(dim, 10)):
152161
name = "n%i" % i
153162
print("add_vector {} {} res {}".format(
154163
name, vector, add_vector("test_idx0", name, vector)))
155164
# print("get_vector res {}".format(get_vector("test_idx0", name)))
156-
for i, vector in enumerate(get_random_vectors(dim, 100)):
165+
for i, vector in enumerate(get_random_vectors(dim, 10)):
157166
print("add_vector_id {} {} res {}".format(
158167
i, vector, add_vector_id("test_idx0", i, vector)))
159168
# print("get_vector_id res {}".format(get_vector_id("test_idx0", i)))
@@ -165,4 +174,10 @@ def kann_search(index_name: str, k: int, query_vector: []):
165174
kann_search("test_idx0", k, query_vector)))
166175

167176
print("delete_index res {}".format(delete_index("test_idx0")))
177+
178+
179+
if __name__ == "__main__":
180+
# test_case()
181+
example_all()
182+
168183
cli.close()

examples/conf_cases.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ def get_client() -> Client:
2020

2121

2222
def get_random_vectors(dim: int, n: int):
23-
return [[random() for _ in range(dim)] for _ in range(n)]
23+
return [[(random()/100)-(random()/100) for _ in range(dim)] for _ in range(n)]
24+
25+
26+
test_vector = [0.02061,-0.001164,0.01122,0.02457,-0.02325,0.05814,-0.0329,0.02614,0.03014,0.01224,-0.02493,0.01263,-0.01177,-0.01816,-0.003378,-0.01474,0.00568,-0.01721,0.02635,-0.00509,-0.0171,-0.006332,0.0547,-0.01878,0.014,-0.004673,-0.001793,0.02002,-0.03232,0.01066,-0.00907,0.02768,-0.000297,0.014465,-0.02557,0.0002458,-0.01169,0.04437,0.03473,0.000768,0.03043,-0.01816,-0.02747,-0.01243,0.01726,-0.0097,0.0298,0.006886,-0.00837,-0.010056,0.007404,0.01636,-0.04507,-0.00765,0.04453,-0.02527,-0.02505,-0.005974,0.01807,0.01366,-0.006702,0.03745,0.00581,-0.01557,-0.02116,0.05484,-0.01514,0.01087,-0.02185,-0.00633,-0.02911,0.04187,0.007053,0.03555,-0.00971,-0.04077,-0.01023,0.01855,0.05066,-0.01431,0.0162,-0.0085,-0.01026,0.015465,-0.02426,-0.01125,0.1757,-0.04645,-0.01563,0.01176,-0.01383,-0.0327,0.0829,-0.04977,-0.03436,-0.02898,-0.002192,0.003319,0.02863,-0.00967,0.04236,0.001298,-0.05035,0.0549,-0.01442,0.00717,0.02766,-0.01027,0.010826,0.02611,0.003899,0.01204,-0.002256,0.03555,0.0216,0.00665,-0.00683,0.00734,-0.006027,-0.00902,0.0363,0.01058,-0.003263,0.02122,-0.02538,-0.003544,-0.01419,0.007347,0.01323,-0.0308,0.002895,0.004898,0.00211,-0.01674,-0.01009,0.0146,-0.04056,-0.001577,0.004158,0.04257,0.0113,-0.004353,0.0439,-0.011284,-0.02298,0.008194,0.007183,-0.00806,0.04645,0.004932,-0.03305,-0.02266,-0.02367,0.01247,-0.03162,0.024,0.02628,-0.02945,-0.006958,-0.012764,-0.001346,-0.01502,-0.004635,0.00789,-0.02365,-0.00798,-0.05173,0.04105,0.0587,-0.0795,0.04987,0.05377,-0.0183,0.02577,0.00177,0.04044,0.02399,-0.01747,-0.004086,-0.02182,-0.0081,-0.03348,0.00476,-0.04303,0.02171,0.01595,-0.03693,-0.03021,0.00894,-0.000992,0.007362,-0.01729,0.04727,-0.03087,-0.0059,-0.02702,0.01091,-0.05264,-0.02347,0.01549,0.01947,-0.04022,0.01942,0.04324,0.0168,0.01527,-0.0691,0.01837,0.02295,0.0002339,0.0083,0.01831,0.01303,0.011665,-0.0228,0.005974,0.03326,0.02911,-0.01254,-0.00833,-0.01575,-0.003637,-0.0506,0.003572,-0.02966,0.01643,6.83e-05,-0.03087,0.02438,0.00405,0.009926,-0.02261,0.0212,0.01108,-0.03162,-0.011856,0.02402,0.008286,-0.03046,-0.001284,0.01985,0.02032,0.02586,-0.004444,-0.006004,0.03918,0.0089,0.02911,0.03412,0.006615,-0.02486,-0.0516,-0.02618,0.01036,-0.005074,-0.02846,-0.0518,-0.014725,-0.01704,0.0634,0.007183,-0.003523,-0.02945,-0.02324,0.02606,-0.05106,-0.01096,0.0569,0.0408,0.03168,0.007477,-0.04285,-0.0336,0.03067,0.01996,-0.0339,-0.0155,-0.034,0.01497,-0.004337,-0.00947,0.04004,0.003574,0.04282,0.04706,-0.03763,0.005005,-0.00873,-0.03041,-0.02122,-0.001866,0.004494,-0.005196,-0.01894,-0.00711,-0.01694,0.01365,0.02132,-0.05676,0.004982,0.04645,0.00941,0.03864,0.002674,0.01636,0.01743,-0.02158,0.010254,-0.00341,-0.00513,-0.03232,-0.009026,-0.00455,0.0422,0.0329,0.01099,-0.02638,0.0359,-0.01773,0.04166,0.02544,0.02534,-0.02934,0.0007305,-0.00956,0.0366,-0.02716,0.006687,0.02963,-0.0008607,-0.0004542,0.01476,-0.03503,-0.03528,0.0455,0.0001229,0.00651,-0.04224,0.0174,-0.012085,-0.03062,-0.008995,0.03613,-0.01741,0.00251,0.02644,0.004513,-0.01374,0.00899,0.009315,-0.0277,0.02522,-0.03717,-0.02165,-0.01279,0.0803,0.01188,-0.0005803,0.01134,-0.0004983,0.02116,0.1403,0.01176,0.01622,-0.01295,0.00297,0.02145,0.0395,0.04886,-0.01168,0.002623,-0.007027,-0.0162,-0.0516,0.003496,-0.01904,-0.02904,0.00831,0.03384,0.03056,-0.0495,0.005817,0.0225,0.01471,0.00175,0.011604,-0.1066,-0.00565,0.01297,-0.0204,0.03117,-0.005356,-0.006912,0.03503,-0.007587,0.01767,0.00628,0.02415,-0.00949,0.0491,-0.001837,-0.0332,-0.001059,0.001193,-0.01778,0.00137,0.02872,0.004673,-0.0418,0.03815,-0.01755,-0.00797,0.01686,-0.0667,0.02199,-0.03293,0.01672,-0.06274,0.01511,-0.02646,-0.0654,0.03235,0.00992,-0.007404,0.003654,-0.005157,0.02466,-0.01251,-0.0215,-0.05774,0.0278,-0.025,0.04645,-0.0372,-0.03268,0.0008025,0.04373,-0.04572,0.006493,-0.01971,0.02928,-0.00751,0.003548,-0.009224,-0.00837,-0.03076,0.01894,0.00329,0.03333,-0.0045,-0.002182,0.02028,0.0251,-0.0317,0.00679,0.03607,0.00607,-0.03928,0.0028,-0.02223,-0.02643,0.0764,0.00902,0.004986,-0.0439,0.03223,-0.015396,-0.02666,0.053,0.01179,0.00946,0.002127,-0.00967,0.1015,-0.005005,-0.01426,-0.00752,0.007736,-0.01752,0.00226,0.008415,-0.05338,0.0381,-0.02803,0.0125,0.02211,0.0509,0.009895,0.03955,-0.0164,0.02249,0.04327,-0.01483,0.03983,0.02246,0.02194,-0.03134,-0.02353,-0.003231,-0.006165,0.01089,-0.002752,-0.02689,0.001054,-0.003149,-0.00154,-0.01494,0.01198,-0.01177,-0.00277,0.03885,-0.01054,-0.02869,0.01511,-0.05594,0.00365,-0.01095,0.02167,-0.02773,-0.001554,0.02069,0.11273,0.00407,-0.008194,-0.0366,-0.05304,-0.3716,-0.02818,0.002369,0.01084,-0.00982,-0.02434,-0.006256,0.0411,-0.003046,0.02492,-0.02505,-0.00543,-0.0444,-0.01044,0.0317,0.02428,0.02977,-0.001904,0.02975,0.004486,0.02623,0.02032,-0.04282,0.00825,-0.006744,0.005787,0.005875,0.003443,-0.01764,0.04343,0.01266,0.0008826,0.0301,-0.02776,-0.03525,-0.01423,0.03165,-0.01845,0.0738,-0.0159,-0.04733,-0.06168,0.02414,-0.000987,0.0324,0.009415,-0.01668,-0.012794,-0.02832,0.01396,0.00201,-0.001542,0.005272,-0.05463,0.01468,0.004013,0.0217,0.03317,0.03348,-0.010185,-0.01361,-0.02316,-0.06244,-0.05246,-0.0198,-0.006706,0.02155,-0.0337,0.004753,-0.0516,-0.0299,0.003006,0.001741,0.02742,-0.03186,0.05835,-0.005184,0.001007,-0.0009613,0.001318,-0.006294,0.03558,-0.008644,0.007538,-0.065,2.39e-05,0.002295,-0.04678,-0.0182,-0.001993,-0.01101,0.0003996,0.04404,0.001364,-0.004753,-0.02151,-0.02592,0.02188,-0.0018,-0.00578,-0.00668,-0.0116,0.03964,0.003391,-0.01253,0.000471,0.05338,0.01665,-0.00532,0.01608,3.755e-05,-0.00849,0.0292,0.0674,0.02483,-0.02759,-0.03918,-0.01927,0.03105,-0.012474,-0.02036,-0.004826,0.03598,0.0005326,0.01238,-0.0437,0.00957,0.03802,0.03015,0.0451,-0.01133,0.0831,0.04556,-3.4e-06,0.00732,0.0363,0.008934,-0.005264,0.006325,-0.005455,-0.04205,-0.00224,-0.00911,-0.01775,0.006176,0.000915,-0.001221,0.01674,-0.006172,0.01412,-0.0436,0.01886,0.00993,-0.011856,-0.00849,-0.00685,-0.03946,-0.0409,-0.006077,0.0265,0.01726,-0.0501,-0.001554,0.00964,-0.02446,-0.02002,-0.02136,-0.006958,0.0288,-0.017,-0.0239,0.01018,-0.03717,-0.0467,-0.05023,0.04257,-0.02643,-0.0438,-0.05365,-0.0206,-0.003052,-0.02956,-0.00882,0.03595,0.02948,-0.008606,0.02036,0.02838,-0.02217,-0.0204,0.007698,-0.0283,-0.038,0.01377,0.0003722,0.0455,0.01581,0.00829,-0.0059,-0.001851,-0.02344,0.00529,-0.03778,0.01321,-0.02512,-0.010124,-0.001365,0.0373,-0.01436,0.02394,0.02151,0.02728,-0.03015,-0.03001,0.02036,-0.02165,0.0174,-0.0633,0.0222,0.003521,-0.002064,0.01358,-0.01907,-0.0193,0.01733,-0.02121,-0.0172,-0.0165,0.0491,-0.00181,0.0274,-0.06537,-0.01701,0.01221,-0.03104,-0.0705,-0.001437,0.03104,0.001791,0.03787,-0.01015,0.005352,-0.003134,0.01059,0.0725,0.013084,0.009056,0.0457,0.02295,0.03165,0.04028,0.04498,0.1039,-0.0483,-0.02742,0.0198,0.0178,-0.0666,-0.04086,-0.01915,-0.02028,0.02245,-0.02808,-0.01077,0.01947,0.0004327,0.02571,0.02898,0.04575,-0.09674,-0.02104,-0.0433,0.007008,0.001659,0.03094,0.00902,-0.01646,-0.006474,0.02585,-0.0295,-0.05716,-0.0001229,-0.04648,0.03134,0.0331,-0.00828,-0.001054,0.0394,0.00438,0.0094,-0.001987,-0.0335,-0.01554,0.01738,0.05945,0.04575,-0.03558,-0.02434,-0.06042,-0.01471,-0.002628,0.009895,-0.001577,-0.02115,-0.0737,0.0217,0.012924,-0.004623,-0.04446,-0.013115,0.00803,-0.03836,-0.03436,0.0422,-0.01584,-0.0006146,-0.02196,-0.002096,-0.0314,0.004883,0.04492,0.01909,-0.02188,0.01723,-0.02975,-0.02281,0.03192,0.02454,0.00764,-0.004997,-0.05066,-0.01161,-0.00751,-0.0407,0.004753,-0.011024,0.0145,0.004673,0.01675,0.01162,-0.0582,-0.010025,0.02278,-0.0344,-0.02611,-0.001786,0.0373,-0.01724,-0.0443,-0.00309,0.02164,0.01326,0.004257,-0.02043,-0.04218,-0.04315,-0.02312,-0.012856,0.01997,-0.02512,-0.01165,0.01915,-0.0225,-0.01114,-0.00837,0.0775,0.0565,0.01953,-0.00551,0.0001195,0.02727,0.01968,-0.03766,0.01329,0.05228,-0.05954,0.0254,-0.02672,0.004875,0.02272,-0.01478,0.02533,0.001273,-0.0215,0.002481,0.035,0.02216,-0.0843,0.0171,-0.02327,0.010284,-0.01214,-0.015175,0.07184,0.02766,0.001923,0.004147,0.01198,-0.04892,0.01519,0.004707,-0.04404,0.0229,-0.0549,0.02498,-0.0247,0.013054,0.01497,0.00481,0.02962,-0.04657,-0.032,-0.01804,-0.02693,-0.0203,0.03458,-7.51e-05,-0.03632,-0.02354,-0.01797,0.02321,0.02795,0.0895,-0.012184,-0.00454,-0.05377,-0.0164,0.01067,-0.03015,-0.01978,-0.01804,0.04285,-0.0236,0.010925,-0.005093,-0.0418,0.04382,0.01903,0.00367,0.00566,-0.02962,0.04517,0.042,-0.004467,0.01634,0.02045,-0.0684,-0.02278,-0.02213,0.01169,0.00028,0.01221,-0.01213,0.02013,-0.02824,0.012276,0.0003872,0.01015,-0.03964,0.01481,0.02103,-0.0283,-0.02426,-0.03162,-0.0371,0.0297,-0.02316,-0.01959,0.01129,-0.04523,-0.0636,0.02248,-0.0226,0.02126,-0.005074,-0.02397,-0.03043,0.01214,-0.006462,0.02272,-0.0002117,0.000712,-0.03125,-0.0158,0.00652,-0.02596,0.05447,0.0061,-0.014694,0.0008836,0.01322,-0.02307,-0.03357,-0.003414,0.07153,-0.00635,-0.03745,0.03198]

redisx/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def parse_usearch_get_node_result(resp) -> Union[Dict, None]:
4040
def parse_usearch_kann_search_result(resp) -> Union[Dict, None]:
4141
if len(resp) == 1:
4242
return {"size": int(resp[0]), "vals": None}
43-
if (len(resp)-1) % 2 == 0:
43+
if len(resp) > 1:
4444
vals = []
4545
for item in resp[1:]:
4646
vals.append(pairs_to_dict(

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
description="Python client for RedisX",
77
long_description=open("README.md").read().strip(),
88
long_description_content_type="text/markdown",
9-
version="0.1.0",
9+
version="0.1.6",
1010
license="MIT",
1111
url="https://github.com/weedge/redisx-py",
1212
author="weedge",

0 commit comments

Comments
 (0)