Skip to content

Commit 5a7030d

Browse files
author
liyan.90210
committed
feat auto update sdk
1 parent aa63ff6 commit 5a7030d

File tree

9 files changed

+90
-20
lines changed

9 files changed

+90
-20
lines changed

Changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
### Change log
22

3+
2024-11-28 Bumped to version v1.0.163
4+
- Updated apis for viking_db/visual/tls
5+
36
2024-11-21 Bumped to version v1.0.162
47
- Updated apis for viking_db
58

volcengine/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# coding:utf-8
2-
VERSION='v1.0.162'
2+
VERSION='v1.0.163'
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import os
2+
import unittest
3+
4+
from volcengine.tls.TLSService import TLSService
5+
6+
class TestTLSService(unittest.TestCase):
7+
8+
def test_init(self):
9+
endpoint = os.environ["VOLCENGINE_ENDPOINT"]
10+
region = os.environ["VOLCENGINE_REGION"]
11+
access_key_id = os.environ["VOLCENGINE_ACCESS_KEY_ID"]
12+
access_key_secret = os.environ["VOLCENGINE_ACCESS_KEY_SECRET"]
13+
14+
tls_client1 = TLSService(endpoint, access_key_id, access_key_secret, region)
15+
tls_client2 = TLSService(endpoint + "test", access_key_id + "test", access_key_secret + "test", region + "test")
16+
17+
self.assertNotEqual(tls_client1, tls_client2)
18+
self.assertEqual(region, tls_client1.get_region())
19+
self.assertEqual(region + "test", tls_client2.get_region())
20+
21+
if __name__ == '__main__':
22+
unittest.main()

volcengine/example/viking_db/example.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@
1313

1414
if __name__ == '__main__':
1515
vikingdb_service = VikingDBService()
16-
vikingdb_service.set_ak("")
17-
vikingdb_service.set_sk("")
16+
vikingdb_service.set_ak()
17+
vikingdb_service.set_sk()
18+
19+
# id = vikingdb_service.create_task(TaskType.Filter_Delete, {"collection_name": "example", "filter": {"like": [2]}})
20+
# print(id)
21+
22+
# res = vikingdb_service.update_task("ae6f9a4e-9a68-5374-9687-36017c1ddd3e", task_status=TaskStatus.Confirmed)
1823

1924
# id = vikingdb_service.create_task(TaskType.Data_Import, {"tos_path": "demo-1028/demo_1030", "file_type":"json", "ignore_error":False, "collection_name":"sparse"})
2025
# print(id)
2126

22-
# task = vikingdb_service.get_task("01f7f554-46b9-55d6-af6c-b2aa9502d229")
23-
# print(task.process_info["err_msg"])
27+
# task = vikingdb_service.get_task("bc5e952d-3f95-5e0c-b310-548933890308")
28+
# print(task.task_status)
2429

2530
# tasks = vikingdb_service.list_tasks()
2631
# for item in tasks:
@@ -153,7 +158,7 @@ def gen_random_vector(dim):
153158
# default_val=True
154159
# ),
155160
# ]
156-
# res = vikingdb_service.create_collection("example1", fields, "This is an example")
161+
# res = vikingdb_service.create_collection("example", fields, "This is an example")
157162
# # 返回一个collection实例
158163
# print(res)
159164
#
@@ -196,13 +201,13 @@ def gen_random_vector(dim):
196201
# res[i] = random.random() - 0.5
197202
# return res
198203
# collection = vikingdb_service.get_collection("example")
199-
# field1 = {"doc_id": "111", "text_vector": gen_random_vector(10), "like": 1, "price": 1.11,
204+
# field1 = {"doc_id": "111", "text_vector": gen_random_vector(12), "like": 1, "price": 1.11,
200205
# "author": ["gy"], "aim": True}
201-
# field2 = {"doc_id": "222", "text_vector": gen_random_vector(10), "like": 2, "price": 2.22,
206+
# field2 = {"doc_id": "222", "text_vector": gen_random_vector(12), "like": 2, "price": 2.22,
202207
# "author": ["gy", "xjq"], "aim": False}
203-
# field3 = {"doc_id": "333", "text_vector": gen_random_vector(10), "like": 3, "price": 3.33,
208+
# field3 = {"doc_id": "333", "text_vector": gen_random_vector(12), "like": 3, "price": 3.33,
204209
# "author": ["gy", "xjq"], "aim": False}
205-
# field4 = {"doc_id": "444", "text_vector": gen_random_vector(10), "like": 4, "price": 4.44,
210+
# field4 = {"doc_id": "444", "text_vector": gen_random_vector(12), "like": 4, "price": 4.44,
206211
# "author": ["gy", "xjq"], "aim": False}
207212
# data1 = Data(field1)
208213
# data2 = Data(field2)
@@ -217,7 +222,7 @@ def gen_random_vector(dim):
217222

218223
#
219224
# collection = vikingdb_service.get_collection("example")
220-
# res = collection.fetch_data("111")
225+
# res = collection.fetch_data("333")
221226
# print(res.fields)
222227
# res = collection.fetch_data(["111", "222", "333", "444"])
223228
# # 返回一个列表
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# coding:utf-8
2+
from __future__ import print_function
3+
4+
from volcengine.visual.VisualService import VisualService
5+
6+
if __name__ == '__main__':
7+
visual_service = VisualService()
8+
9+
# call below method if you don't set ak and sk in $HOME/.volc/config
10+
visual_service.set_ak('')
11+
visual_service.set_sk('')
12+
13+
form = {
14+
"req_key": "cert_pro_liveness_verify_query",
15+
"byted_token": "",
16+
"omit_data": False,
17+
"omit_image_data": False,
18+
"omit_video_data": False
19+
}
20+
resp = visual_service.cert_pro_liveness_verify_query(form)
21+
print(resp)

volcengine/tls/TLSService.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,6 @@ def calc_backoff_ms(expected_quit_timestamp_ms):
133133
sleep_ms = 0
134134
return sleep_ms
135135

136-
def __new__(cls, *args, **kwargs):
137-
if not hasattr(TLSService, "_instance"):
138-
with TLSService._instance_lock:
139-
if not hasattr(TLSService, "_instance"):
140-
TLSService._instance = object.__new__(cls)
141-
142-
return TLSService._instance
143-
144136
def __init__(self, endpoint: str, access_key_id: str, access_key_secret: str, region: str,
145137
security_token: str = None, scheme: str = "https", timeout: int = 60,
146138
api_version=API_VERSION_V_0_3_0):

volcengine/viking_db/VikingDBService.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ def get_api_info():
124124
{'Accept': 'application/json', 'Content-Type': 'application/json'}),
125125
"DropTask": ApiInfo("POST", "/api/task/drop", {}, {},
126126
{'Accept': 'application/json', 'Content-Type': 'application/json'}),
127-
127+
"UpdateTask": ApiInfo("POST", "/api/task/update", {}, {},
128+
{'Accept': 'application/json', 'Content-Type': 'application/json'}),
128129
}
129130
return api_info
130131

@@ -1195,3 +1196,10 @@ def list_tasks(self):
11951196
def drop_task(self, task_id):
11961197
params = {"task_id": task_id}
11971198
res = self.json_exception("DropTask", {}, json.dumps(params))
1199+
1200+
def update_task(self, task_id, task_status):
1201+
params = {
1202+
"task_id": task_id,
1203+
"task_status": task_status.value
1204+
}
1205+
res = self.json_exception("UpdateTask", {}, json.dumps(params))

volcengine/viking_db/common.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ class Order(Enum):
6767

6868
class TaskType(Enum):
6969
Data_Import = "data_import"
70+
Filter_Delete = "filter_delete"
71+
72+
class TaskStatus(Enum):
73+
Init = "init"
74+
Queued = "queued"
75+
Running = "running"
76+
Done = "done"
77+
Fail = "fail"
78+
Confirm = "confirm"
79+
Confirmed = "confirmed"
7080

7181
class EmbModel(object):
7282
def __init__(self, model_name, params=None):

volcengine/visual/VisualService.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ def get_api_info():
163163
"CVSync2AsyncGetResult": ApiInfo("POST", "/", {"Action": "CVSync2AsyncGetResult", "Version": "2022-08-31"},{}, {}),
164164
"CVSync2AsyncSubmitTask": ApiInfo("POST", "/",{"Action": "CVSync2AsyncSubmitTask", "Version": "2022-08-31"}, {}, {}),
165165
"CVProcess": ApiInfo("POST", "/", {"Action": "CVProcess", "Version": "2022-08-31"}, {}, {}),
166+
"CertLivenessVerifyQuery": ApiInfo("POST", "/",
167+
{"Action": "CertLivenessVerifyQuery", "Version": "2022-08-31"}, {}, {}),
166168
}
167169
return api_info
168170

@@ -257,6 +259,13 @@ def cv_sync2async_get_result(self, form):
257259
except Exception as e:
258260
raise Exception(str(e))
259261

262+
def cert_pro_liveness_verify_query(self, form):
263+
try:
264+
res_json = self.common_json_handler("CertLivenessVerifyQuery", form)
265+
return res_json
266+
except Exception as e:
267+
raise Exception(str(e))
268+
260269
def img2img_xl_sft(self, form):
261270
try:
262271
res_json = self.common_json_handler("Img2ImgXLSft", form)

0 commit comments

Comments
 (0)