Skip to content

Commit 0eb1091

Browse files
robmarkcolerobmarkcole
authored
Merge pull request #34 from robmarkcole/Support-min_confidence
add min_confidence
2 parents 333cfd0 + a05f1ca commit 0eb1091

File tree

4 files changed

+76
-42
lines changed

4 files changed

+76
-42
lines changed

‎deepstack/core.py‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
DEFAULT_TIMEOUT = 10 # seconds
1111
DEFAULT_IP = "localhost"
1212
DEFAULT_PORT = 80
13+
DEFAULT_MIN_CONFIDENCE = 0.45
1314

1415
## HTTP codes
1516
HTTP_OK = 200
@@ -92,11 +93,10 @@ def get_objects_summary(predictions: List[Dict]):
9293

9394

9495
def post_image(
95-
url: str, image_bytes: bytes, api_key: str, timeout: int, data: dict = {}
96+
url: str, image_bytes: bytes, timeout: int, data: dict
9697
) -> requests.models.Response:
9798
"""Post an image to Deepstack. Only handles exceptions."""
9899
try:
99-
data["api_key"] = api_key # Insert the api_key
100100
return requests.post(
101101
url, files={"image": image_bytes}, data=data, timeout=timeout
102102
)
@@ -111,12 +111,17 @@ def post_image(
111111

112112

113113
def process_image(
114-
url: str, image_bytes: bytes, api_key: str, timeout: int, data: dict = {}
114+
url: str,
115+
image_bytes: bytes,
116+
api_key: str,
117+
min_confidence: float,
118+
timeout: int,
119+
data: dict = {},
115120
) -> Dict:
116121
"""Process image_bytes and detect. Handles common status codes"""
117-
response = post_image(
118-
url=url, image_bytes=image_bytes, api_key=api_key, timeout=timeout, data=data
119-
)
122+
data["api_key"] = api_key
123+
data["min_confidence"] = min_confidence
124+
response = post_image(url=url, image_bytes=image_bytes, timeout=timeout, data=data)
120125
if response.status_code == HTTP_OK:
121126
return response.json()
122127
elif response.status_code == BAD_URL:
@@ -136,17 +141,18 @@ def __init__(
136141
port: int = DEFAULT_PORT,
137142
api_key: str = DEFAULT_API_KEY,
138143
timeout: int = DEFAULT_TIMEOUT,
144+
min_confidence: float = DEFAULT_MIN_CONFIDENCE,
139145
url_detect: str = "",
140146
url_recognize: str = "",
141147
url_register: str = "",
142148
):
143-
149+
self._api_key = api_key
150+
self._timeout = timeout
151+
self._min_confidence = min_confidence
144152
self._url_base = URL_BASE_VISION.format(ip=ip, port=port)
145153
self._url_detect = self._url_base + url_detect
146154
self._url_recognize = self._url_base + url_recognize
147155
self._url_register = self._url_base + url_register
148-
self._api_key = api_key
149-
self._timeout = timeout
150156

151157
def detect(self):
152158
"""Process image_bytes and detect."""
@@ -170,14 +176,20 @@ def __init__(
170176
port: int = DEFAULT_PORT,
171177
api_key: str = DEFAULT_API_KEY,
172178
timeout: int = DEFAULT_TIMEOUT,
179+
min_confidence: float = DEFAULT_MIN_CONFIDENCE,
173180
custom_model: str = "",
174181
):
175182
if custom_model:
176183
url_detect = URL_CUSTOM.format(custom_model=custom_model)
177184
else:
178185
url_detect = URL_OBJECT_DETECTION
179186
super().__init__(
180-
ip=ip, port=port, api_key=api_key, timeout=timeout, url_detect=url_detect,
187+
ip=ip,
188+
port=port,
189+
api_key=api_key,
190+
timeout=timeout,
191+
min_confidence=min_confidence,
192+
url_detect=url_detect,
181193
)
182194

183195
def detect(self, image_bytes: bytes):
@@ -186,6 +198,7 @@ def detect(self, image_bytes: bytes):
186198
url=self._url_detect,
187199
image_bytes=image_bytes,
188200
api_key=self._api_key,
201+
min_confidence=self._min_confidence,
189202
timeout=self._timeout,
190203
)
191204
return response["predictions"]
@@ -200,12 +213,14 @@ def __init__(
200213
port: int = DEFAULT_PORT,
201214
api_key: str = DEFAULT_API_KEY,
202215
timeout: int = DEFAULT_TIMEOUT,
216+
min_confidence: float = DEFAULT_MIN_CONFIDENCE,
203217
):
204218
super().__init__(
205219
ip=ip,
206220
port=port,
207221
api_key=api_key,
208222
timeout=timeout,
223+
min_confidence=min_confidence,
209224
url_recognize=URL_SCENE_RECOGNIZE,
210225
)
211226

@@ -215,6 +230,7 @@ def recognize(self, image_bytes: bytes):
215230
url=self._url_recognize,
216231
image_bytes=image_bytes,
217232
api_key=self._api_key,
233+
min_confidence=self._min_confidence,
218234
timeout=self._timeout,
219235
)
220236
del response["success"]
@@ -230,12 +246,14 @@ def __init__(
230246
port: int = DEFAULT_PORT,
231247
api_key: str = DEFAULT_API_KEY,
232248
timeout: int = DEFAULT_TIMEOUT,
249+
min_confidence: float = DEFAULT_MIN_CONFIDENCE,
233250
):
234251
super().__init__(
235252
ip=ip,
236253
port=port,
237254
api_key=api_key,
238255
timeout=timeout,
256+
min_confidence=min_confidence,
239257
url_detect=URL_FACE_DETECTION,
240258
url_register=URL_FACE_REGISTER,
241259
url_recognize=URL_FACE_RECOGNIZE,
@@ -247,6 +265,7 @@ def detect(self, image_bytes: bytes):
247265
url=self._url_detect,
248266
image_bytes=image_bytes,
249267
api_key=self._api_key,
268+
min_confidence=self._min_confidence,
250269
timeout=self._timeout,
251270
)
252271
return response["predictions"]
@@ -259,6 +278,7 @@ def register(self, name: str, image_bytes: bytes):
259278
url=self._url_register,
260279
image_bytes=image_bytes,
261280
api_key=self._api_key,
281+
min_confidence=self._min_confidence,
262282
timeout=self._timeout,
263283
data={"userid": name},
264284
)
@@ -278,6 +298,7 @@ def recognize(self, image_bytes: bytes):
278298
url=self._url_recognize,
279299
image_bytes=image_bytes,
280300
api_key=self._api_key,
301+
min_confidence=self._min_confidence,
281302
timeout=self._timeout,
282303
)
283304

‎usage-face-recognition.ipynb‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
},
5656
{
5757
"cell_type": "code",
58-
"execution_count": 5,
58+
"execution_count": 4,
5959
"metadata": {},
6060
"outputs": [
6161
{
@@ -87,15 +87,15 @@
8787
},
8888
{
8989
"cell_type": "code",
90-
"execution_count": 6,
90+
"execution_count": 5,
9191
"metadata": {},
9292
"outputs": [
9393
{
9494
"name": "stdout",
9595
"output_type": "stream",
9696
"text": [
97-
"CPU times: user 11.7 ms, sys: 10.4 ms, total: 22.1 ms\n",
98-
"Wall time: 793 ms\n"
97+
"CPU times: user 17.5 ms, sys: 26.5 ms, total: 44 ms\n",
98+
"Wall time: 3.32 s\n"
9999
]
100100
}
101101
],
@@ -110,7 +110,7 @@
110110
},
111111
{
112112
"cell_type": "code",
113-
"execution_count": 7,
113+
"execution_count": 6,
114114
"metadata": {},
115115
"outputs": [
116116
{
@@ -128,7 +128,7 @@
128128
" 'x_max': 1988}]"
129129
]
130130
},
131-
"execution_count": 7,
131+
"execution_count": 6,
132132
"metadata": {},
133133
"output_type": "execute_result"
134134
}
@@ -139,7 +139,7 @@
139139
},
140140
{
141141
"cell_type": "code",
142-
"execution_count": 8,
142+
"execution_count": 7,
143143
"metadata": {},
144144
"outputs": [
145145
{
@@ -148,7 +148,7 @@
148148
"2"
149149
]
150150
},
151-
"execution_count": 8,
151+
"execution_count": 7,
152152
"metadata": {},
153153
"output_type": "execute_result"
154154
}
@@ -167,16 +167,16 @@
167167
},
168168
{
169169
"cell_type": "code",
170-
"execution_count": 9,
170+
"execution_count": 8,
171171
"metadata": {},
172172
"outputs": [
173173
{
174174
"name": "stdout",
175175
"output_type": "stream",
176176
"text": [
177177
"face updated\n",
178-
"CPU times: user 6.61 ms, sys: 4.41 ms, total: 11 ms\n",
179-
"Wall time: 703 ms\n"
178+
"CPU times: user 5.15 ms, sys: 4.79 ms, total: 9.94 ms\n",
179+
"Wall time: 1.17 s\n"
180180
]
181181
}
182182
],
@@ -200,15 +200,15 @@
200200
},
201201
{
202202
"cell_type": "code",
203-
"execution_count": 10,
203+
"execution_count": 9,
204204
"metadata": {},
205205
"outputs": [
206206
{
207207
"name": "stdout",
208208
"output_type": "stream",
209209
"text": [
210-
"CPU times: user 4.9 ms, sys: 3 ms, total: 7.91 ms\n",
211-
"Wall time: 1.56 s\n"
210+
"CPU times: user 5.39 ms, sys: 3.95 ms, total: 9.34 ms\n",
211+
"Wall time: 2.38 s\n"
212212
]
213213
}
214214
],
@@ -223,14 +223,14 @@
223223
},
224224
{
225225
"cell_type": "code",
226-
"execution_count": 11,
226+
"execution_count": 10,
227227
"metadata": {},
228228
"outputs": [
229229
{
230230
"data": {
231231
"text/plain": [
232-
"[{'confidence': 0,\n",
233-
" 'userid': 'unknown',\n",
232+
"[{'confidence': 0.58644783,\n",
233+
" 'userid': 'idris',\n",
234234
" 'y_min': 226,\n",
235235
" 'x_min': 871,\n",
236236
" 'y_max': 728,\n",
@@ -243,7 +243,7 @@
243243
" 'x_max': 1988}]"
244244
]
245245
},
246-
"execution_count": 11,
246+
"execution_count": 10,
247247
"metadata": {},
248248
"output_type": "execute_result"
249249
}
@@ -264,16 +264,16 @@
264264
},
265265
{
266266
"cell_type": "code",
267-
"execution_count": 12,
267+
"execution_count": 11,
268268
"metadata": {},
269269
"outputs": [
270270
{
271271
"data": {
272272
"text/plain": [
273-
"{'Idris Elba': 73.3}"
273+
"{'idris': 58.6, 'Idris Elba': 73.3}"
274274
]
275275
},
276-
"execution_count": 12,
276+
"execution_count": 11,
277277
"metadata": {},
278278
"output_type": "execute_result"
279279
}

‎usage-object-detection.ipynb‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
"IP = 'localhost'\n",
3030
"PORT = '80'\n",
3131
"API_KEY = \"\"\n",
32-
"TIMEOUT = 20 # Default is 10"
32+
"TIMEOUT = 20 # Default is 10\n",
33+
"MIN_CONFIDENCE = 0.01 # Default is 0.45"
3334
]
3435
},
3536
{
@@ -50,7 +51,7 @@
5051
"metadata": {},
5152
"outputs": [],
5253
"source": [
53-
"dsobject = ds.DeepstackObject(ip=IP, port=PORT, api_key=API_KEY, timeout=TIMEOUT)"
54+
"dsobject = ds.DeepstackObject(ip=IP, port=PORT, api_key=API_KEY, timeout=TIMEOUT, min_confidence=MIN_CONFIDENCE)"
5455
]
5556
},
5657
{
@@ -93,8 +94,8 @@
9394
"name": "stdout",
9495
"output_type": "stream",
9596
"text": [
96-
"CPU times: user 7.59 ms, sys: 4.3 ms, total: 11.9 ms\n",
97-
"Wall time: 442 ms\n"
97+
"CPU times: user 8.8 ms, sys: 5.8 ms, total: 14.6 ms\n",
98+
"Wall time: 1.33 s\n"
9899
]
99100
}
100101
],
@@ -115,7 +116,19 @@
115116
{
116117
"data": {
117118
"text/plain": [
118-
"[{'confidence': 0.90210795,\n",
119+
"[{'confidence': 0.028640902,\n",
120+
" 'label': 'handbag',\n",
121+
" 'y_min': 114,\n",
122+
" 'x_min': 444,\n",
123+
" 'y_max': 522,\n",
124+
" 'x_max': 605},\n",
125+
" {'confidence': 0.037546907,\n",
126+
" 'label': 'frisbee',\n",
127+
" 'y_min': 309,\n",
128+
" 'x_min': 419,\n",
129+
" 'y_max': 333,\n",
130+
" 'x_max': 437},\n",
131+
" {'confidence': 0.90210795,\n",
119132
" 'label': 'dog',\n",
120133
" 'y_min': 348,\n",
121134
" 'x_min': 650,\n",
@@ -167,7 +180,7 @@
167180
{
168181
"data": {
169182
"text/plain": [
170-
"['dog', 'person']"
183+
"['dog', 'frisbee', 'handbag', 'person']"
171184
]
172185
},
173186
"execution_count": 7,
@@ -194,7 +207,7 @@
194207
{
195208
"data": {
196209
"text/plain": [
197-
"{'dog': 1, 'person': 2}"
210+
"{'dog': 1, 'frisbee': 1, 'handbag': 1, 'person': 2}"
198211
]
199212
},
200213
"execution_count": 8,
@@ -316,8 +329,8 @@
316329
"name": "stdout",
317330
"output_type": "stream",
318331
"text": [
319-
"CPU times: user 4.19 ms, sys: 2.03 ms, total: 6.22 ms\n",
320-
"Wall time: 273 ms\n"
332+
"CPU times: user 4.84 ms, sys: 2.68 ms, total: 7.53 ms\n",
333+
"Wall time: 1.08 s\n"
321334
]
322335
}
323336
],

‎usage-scene-detection.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
"name": "stdout",
9494
"output_type": "stream",
9595
"text": [
96-
"CPU times: user 7.43 ms, sys: 3.98 ms, total: 11.4 ms\n",
97-
"Wall time: 300 ms\n"
96+
"CPU times: user 7.54 ms, sys: 3.85 ms, total: 11.4 ms\n",
97+
"Wall time: 423 ms\n"
9898
]
9999
}
100100
],

0 commit comments

Comments
 (0)