Skip to content

Commit f702f15

Browse files
iMuduoiMuduo
committed
face v3
1 parent 098b24e commit f702f15

File tree

3 files changed

+64
-52
lines changed

3 files changed

+64
-52
lines changed

‎aip/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(self, appId, apiKey, secretKey):
4848
self.__connectTimeout = 60.0
4949
self.__socketTimeout = 60.0
5050
self._proxies = {}
51-
self.__version = '2_2_3'
51+
self.__version = '2_2_4'
5252

5353
def getVersion(self):
5454
"""

‎aip/face.py

Lines changed: 62 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ class AipFace(AipBase):
4949

5050
__personVerifyUrl = 'https://aip.baidubce.com/rest/2.0/face/v3/person/verify'
5151

52-
__faceverifyUrl = 'https://aip.baidubce.com/rest/2.0/face/v3/faceverify'
53-
5452
__videoSessioncodeUrl = 'https://aip.baidubce.com/rest/2.0/face/v1/faceliveness/sessioncode'
5553

5654
__videoFacelivenessUrl = 'https://aip.baidubce.com/rest/2.0/face/v1/faceliveness/verify'
@@ -67,10 +65,11 @@ def detect(self, image, image_type, options=None):
6765
data['image_type'] = image_type
6866

6967
data.update(options)
70-
71-
return self._request(self.__detectUrl, data)
68+
return self._request(self.__detectUrl, json.dumps(data, ensure_ascii=False), {
69+
'Content-Type': 'application/json',
70+
})
7271

73-
def search(self, image, image_type, options=None):
72+
def search(self, image, image_type, group_id_list, options=None):
7473
"""
7574
人脸搜索
7675
"""
@@ -79,10 +78,12 @@ def search(self, image, image_type, options=None):
7978
data = {}
8079
data['image'] = image
8180
data['image_type'] = image_type
81+
data['group_id_list'] = group_id_list
8282

8383
data.update(options)
84-
85-
return self._request(self.__searchUrl, data)
84+
return self._request(self.__searchUrl, json.dumps(data, ensure_ascii=False), {
85+
'Content-Type': 'application/json',
86+
})
8687

8788
def addUser(self, image, image_type, group_id, user_id, options=None):
8889
"""
@@ -97,8 +98,9 @@ def addUser(self, image, image_type, group_id, user_id, options=None):
9798
data['user_id'] = user_id
9899

99100
data.update(options)
100-
101-
return self._request(self.__userAddUrl, data)
101+
return self._request(self.__userAddUrl, json.dumps(data, ensure_ascii=False), {
102+
'Content-Type': 'application/json',
103+
})
102104

103105
def updateUser(self, image, image_type, group_id, user_id, options=None):
104106
"""
@@ -113,8 +115,9 @@ def updateUser(self, image, image_type, group_id, user_id, options=None):
113115
data['user_id'] = user_id
114116

115117
data.update(options)
116-
117-
return self._request(self.__userUpdateUrl, data)
118+
return self._request(self.__userUpdateUrl, json.dumps(data, ensure_ascii=False), {
119+
'Content-Type': 'application/json',
120+
})
118121

119122
def faceDelete(self, user_id, group_id, face_token, options=None):
120123
"""
@@ -128,8 +131,9 @@ def faceDelete(self, user_id, group_id, face_token, options=None):
128131
data['face_token'] = face_token
129132

130133
data.update(options)
131-
132-
return self._request(self.__faceDeleteUrl, data)
134+
return self._request(self.__faceDeleteUrl, json.dumps(data, ensure_ascii=False), {
135+
'Content-Type': 'application/json',
136+
})
133137

134138
def getUser(self, user_id, group_id, options=None):
135139
"""
@@ -142,8 +146,9 @@ def getUser(self, user_id, group_id, options=None):
142146
data['group_id'] = group_id
143147

144148
data.update(options)
145-
146-
return self._request(self.__userGetUrl, data)
149+
return self._request(self.__userGetUrl, json.dumps(data, ensure_ascii=False), {
150+
'Content-Type': 'application/json',
151+
})
147152

148153
def faceGetlist(self, user_id, group_id, options=None):
149154
"""
@@ -156,8 +161,9 @@ def faceGetlist(self, user_id, group_id, options=None):
156161
data['group_id'] = group_id
157162

158163
data.update(options)
159-
160-
return self._request(self.__faceGetlistUrl, data)
164+
return self._request(self.__faceGetlistUrl, json.dumps(data, ensure_ascii=False), {
165+
'Content-Type': 'application/json',
166+
})
161167

162168
def getGroupUsers(self, group_id, options=None):
163169
"""
@@ -169,8 +175,9 @@ def getGroupUsers(self, group_id, options=None):
169175
data['group_id'] = group_id
170176

171177
data.update(options)
172-
173-
return self._request(self.__groupGetusersUrl, data)
178+
return self._request(self.__groupGetusersUrl, json.dumps(data, ensure_ascii=False), {
179+
'Content-Type': 'application/json',
180+
})
174181

175182
def userCopy(self, user_id, options=None):
176183
"""
@@ -182,8 +189,9 @@ def userCopy(self, user_id, options=None):
182189
data['user_id'] = user_id
183190

184191
data.update(options)
185-
186-
return self._request(self.__userCopyUrl, data)
192+
return self._request(self.__userCopyUrl, json.dumps(data, ensure_ascii=False), {
193+
'Content-Type': 'application/json',
194+
})
187195

188196
def deleteUser(self, group_id, user_id, options=None):
189197
"""
@@ -196,8 +204,9 @@ def deleteUser(self, group_id, user_id, options=None):
196204
data['user_id'] = user_id
197205

198206
data.update(options)
199-
200-
return self._request(self.__userDeleteUrl, data)
207+
return self._request(self.__userDeleteUrl, json.dumps(data, ensure_ascii=False), {
208+
'Content-Type': 'application/json',
209+
})
201210

202211
def groupAdd(self, group_id, options=None):
203212
"""
@@ -209,8 +218,9 @@ def groupAdd(self, group_id, options=None):
209218
data['group_id'] = group_id
210219

211220
data.update(options)
212-
213-
return self._request(self.__groupAddUrl, data)
221+
return self._request(self.__groupAddUrl, json.dumps(data, ensure_ascii=False), {
222+
'Content-Type': 'application/json',
223+
})
214224

215225
def groupDelete(self, group_id, options=None):
216226
"""
@@ -222,8 +232,9 @@ def groupDelete(self, group_id, options=None):
222232
data['group_id'] = group_id
223233

224234
data.update(options)
225-
226-
return self._request(self.__groupDeleteUrl, data)
235+
return self._request(self.__groupDeleteUrl, json.dumps(data, ensure_ascii=False), {
236+
'Content-Type': 'application/json',
237+
})
227238

228239
def getGroupList(self, options=None):
229240
"""
@@ -234,8 +245,9 @@ def getGroupList(self, options=None):
234245
data = {}
235246

236247
data.update(options)
237-
238-
return self._request(self.__groupGetlistUrl, data)
248+
return self._request(self.__groupGetlistUrl, json.dumps(data, ensure_ascii=False), {
249+
'Content-Type': 'application/json',
250+
})
239251

240252
def personVerify(self, image, image_type, id_card_number, name, options=None):
241253
"""
@@ -250,22 +262,9 @@ def personVerify(self, image, image_type, id_card_number, name, options=None):
250262
data['name'] = name
251263

252264
data.update(options)
253-
254-
return self._request(self.__personVerifyUrl, data)
255-
256-
def faceverify(self, image, image_type, options=None):
257-
"""
258-
在线活体检测
259-
"""
260-
options = options or {}
261-
262-
data = {}
263-
data['image'] = image
264-
data['image_type'] = image_type
265-
266-
data.update(options)
267-
268-
return self._request(self.__faceverifyUrl, data)
265+
return self._request(self.__personVerifyUrl, json.dumps(data, ensure_ascii=False), {
266+
'Content-Type': 'application/json',
267+
})
269268

270269
def videoSessioncode(self, options=None):
271270
"""
@@ -276,8 +275,9 @@ def videoSessioncode(self, options=None):
276275
data = {}
277276

278277
data.update(options)
279-
280-
return self._request(self.__videoSessioncodeUrl, data)
278+
return self._request(self.__videoSessioncodeUrl, json.dumps(data, ensure_ascii=False), {
279+
'Content-Type': 'application/json',
280+
})
281281

282282
def videoFaceliveness(self, session_id, video_base64, options=None):
283283
"""
@@ -290,17 +290,29 @@ def videoFaceliveness(self, session_id, video_base64, options=None):
290290
data['video_base64'] = video_base64
291291

292292
data.update(options)
293-
294-
return self._request(self.__videoFacelivenessUrl, data)
293+
return self._request(self.__videoFacelivenessUrl, json.dumps(data, ensure_ascii=False), {
294+
'Content-Type': 'application/json',
295+
})
295296

296297

298+
__faceverifyUrl = 'https://aip.baidubce.com/rest/2.0/face/v3/faceverify'
299+
300+
def faceverify(self, images):
301+
"""
302+
在线活体检测
303+
"""
304+
305+
return self._request(self.__faceverifyUrl, json.dumps(images, ensure_ascii=False), {
306+
'Content-Type': 'application/json',
307+
})
308+
297309
__matchUrl = 'https://aip.baidubce.com/rest/2.0/face/v3/match'
298310

299311
def match(self, images):
300312
"""
301313
人脸比对
302314
"""
303315

304-
return self._request(self.__matchUrl, json.dumps(images), {
316+
return self._request(self.__matchUrl, json.dumps(images, ensure_ascii=False), {
305317
'Content-Type': 'application/json',
306318
})

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
setup(
1111
name = 'baidu-aip',
12-
version = '2.2.3.0',
12+
version = '2.2.4.0',
1313
packages = [
1414
'aip',
1515
],

0 commit comments

Comments
 (0)