@@ -82,7 +82,7 @@ class SlicingDice(SlicingDiceAPI):
82
82
"""
83
83
def __init__ (
84
84
self , write_key = None , read_key = None , master_key = None ,
85
- custom_key = None , use_ssl = False , timeout = 60 ):
85
+ custom_key = None , use_ssl = True , timeout = 60 , uses_test_endpoint = False ):
86
86
"""Instantiate a new SlicingDice object.
87
87
88
88
Keyword arguments:
@@ -91,9 +91,11 @@ def __init__(
91
91
HTTPS requests. Defaults False.(Optional)
92
92
timeout(int) -- Define timeout to request,
93
93
defaults 30 secs(default 30).
94
+ test(bool) -- if true will use tests end-point (default False)
94
95
"""
95
96
super (SlicingDice , self ).__init__ (
96
- write_key , read_key , master_key , custom_key , use_ssl , timeout )
97
+ master_key , write_key , read_key , custom_key , use_ssl , timeout )
98
+ self .uses_test_endpoint = uses_test_endpoint
97
99
98
100
def _count_query_wrapper (self , url , query ):
99
101
"""Validate count query and make request.
@@ -125,10 +127,9 @@ def _data_extraction_wrapper(self, url, query):
125
127
req_type = "post" ,
126
128
key_level = 0 )
127
129
128
- @staticmethod
129
- def _wrapper_test (test ):
130
+ def _wrapper_test (self ):
130
131
base_url = SlicingDice .BASE_URL
131
- if test :
132
+ if self . uses_test_endpoint :
132
133
base_url += "/test"
133
134
return base_url
134
135
@@ -159,15 +160,14 @@ def get_projects(self):
159
160
key_level = 2
160
161
)
161
162
162
- def create_field (self , data , test = False ):
163
+ def create_field (self , data ):
163
164
"""Create field in Slicing Dice
164
165
165
166
Keyword arguments:
166
167
data -- A dictionary in the Slicing Dice field
167
168
format.
168
- test(bool) -- if true will use tests end-point (default False)
169
169
"""
170
- base_url = self ._wrapper_test (test )
170
+ base_url = self ._wrapper_test ()
171
171
sd_data = validators .FieldValidator (data )
172
172
if sd_data .validator ():
173
173
url = base_url + URLResources .FIELD
@@ -177,32 +177,27 @@ def create_field(self, data, test=False):
177
177
json_data = ujson .dumps (data ),
178
178
key_level = 1 )
179
179
180
- def get_fields (self , test = False ):
181
- """Get a list of fields
182
-
183
- Keyword arguments:
184
- test(bool) -- if true will use tests end-point (default False)
185
- """
186
- base_url = self ._wrapper_test (test )
180
+ def get_fields (self ):
181
+ """Get a list of fields"""
182
+ base_url = self ._wrapper_test ()
187
183
url = base_url + URLResources .FIELD
188
184
return self ._make_request (
189
185
url = url ,
190
186
req_type = "get" ,
191
187
key_level = 2 )
192
188
193
- def index (self , data , auto_create_fields = False , test = False ):
189
+ def index (self , data , auto_create_fields = False ):
194
190
"""Make a index in Slicing Dice API
195
191
196
192
Keyword arguments:
197
193
data -- A dictionary in the Slicing Dice index
198
194
format.
199
195
auto_create_fields(bool) -- if true SlicingDice API will automatically
200
196
create nonexistent fields (default False)
201
- test(bool) -- if true will use tests end-point (default False)
202
197
"""
203
198
if auto_create_fields :
204
199
data ["auto-create-fields" ] = True
205
- base_url = self ._wrapper_test (test )
200
+ base_url = self ._wrapper_test ()
206
201
sd_data = validators .IndexValidator (data )
207
202
if sd_data .validator ():
208
203
url = base_url + URLResources .INDEX
@@ -212,48 +207,42 @@ def index(self, data, auto_create_fields=False, test=False):
212
207
req_type = "post" ,
213
208
key_level = 1 )
214
209
215
- def count_entity (self , query , test = False ):
210
+ def count_entity (self , query ):
216
211
"""Make a count entity query
217
212
218
213
Keyword arguments:
219
214
query -- A dictionary in the Slicing Dice query
220
- test(bool) -- if true will use tests end-point (default False)
221
215
"""
222
- base_url = self ._wrapper_test (test )
216
+ base_url = self ._wrapper_test ()
223
217
url = base_url + URLResources .QUERY_COUNT_ENTITY
224
218
return self ._count_query_wrapper (url , query )
225
219
226
- def count_entity_total (self , test = False ):
227
- """Make a count entity total query
228
-
229
- test(bool) -- if true will use tests end-point (default False)
230
- """
231
- base_url = self ._wrapper_test (test )
220
+ def count_entity_total (self ):
221
+ """Make a count entity total query"""
222
+ base_url = self ._wrapper_test ()
232
223
url = base_url + URLResources .QUERY_COUNT_ENTITY_TOTAL
233
224
return self ._make_request (
234
225
url = url ,
235
226
req_type = "get" ,
236
227
key_level = 0 )
237
228
238
- def count_event (self , query , test = False ):
229
+ def count_event (self , query ):
239
230
"""Make a count event query
240
231
241
232
Keyword arguments:
242
233
data -- A dictionary query
243
- test(bool) -- if true will use tests end-point (default False)
244
234
"""
245
- base_url = self ._wrapper_test (test )
235
+ base_url = self ._wrapper_test ()
246
236
url = base_url + URLResources .QUERY_COUNT_EVENT
247
237
return self ._count_query_wrapper (url , query )
248
238
249
- def aggregation (self , query , test = False ):
239
+ def aggregation (self , query ):
250
240
"""Make a aggregation query
251
241
252
242
Keyword arguments:
253
243
query -- An aggregation query
254
- test(bool) -- if true will use tests end-point (default False)
255
244
"""
256
- base_url = self ._wrapper_test (test )
245
+ base_url = self ._wrapper_test ()
257
246
url = base_url + URLResources .QUERY_AGGREGATION
258
247
if "query" not in query :
259
248
raise exceptions .InvalidQueryException (
@@ -268,14 +257,13 @@ def aggregation(self, query, test=False):
268
257
req_type = "post" ,
269
258
key_level = 0 )
270
259
271
- def top_values (self , query , test = False ):
260
+ def top_values (self , query ):
272
261
"""Make a top values query
273
262
274
263
Keyword arguments:
275
264
query -- A dictionary query
276
- test(bool) -- if true will use tests end-point (default False)
277
265
"""
278
- base_url = self ._wrapper_test (test )
266
+ base_url = self ._wrapper_test ()
279
267
url = base_url + URLResources .QUERY_TOP_VALUES
280
268
sd_query_top_values = validators .QueryValidator (query )
281
269
if sd_query_top_values .validator ():
@@ -285,14 +273,13 @@ def top_values(self, query, test=False):
285
273
req_type = "post" ,
286
274
key_level = 0 )
287
275
288
- def exists_entity (self , ids , test = False ):
276
+ def exists_entity (self , ids ):
289
277
"""Make a exists entity query
290
278
291
279
Keyword arguments:
292
280
ids -- A list with entity to check if exists
293
- test(bool) -- if true will use tests end-point (default False)
294
281
"""
295
- base_url = self ._wrapper_test (test )
282
+ base_url = self ._wrapper_test ()
296
283
url = base_url + URLResources .QUERY_EXISTS_ENTITY
297
284
if len (ids ) > 100 :
298
285
raise exceptions .MaxLimitException (
@@ -306,90 +293,83 @@ def exists_entity(self, ids, test=False):
306
293
req_type = "post" ,
307
294
key_level = 0 )
308
295
309
- def get_saved_query (self , query_name , test = False ):
296
+ def get_saved_query (self , query_name ):
310
297
"""Get a saved query
311
298
312
299
Keyword arguments:
313
300
query_name(string) -- The name of the saved query
314
- test(bool) -- if true will use tests end-point (default False)
315
301
"""
316
- base_url = self ._wrapper_test (test )
302
+ base_url = self ._wrapper_test ()
317
303
url = base_url + URLResources .QUERY_SAVED + query_name
318
304
return self ._make_request (
319
305
url = url ,
320
306
req_type = "get" ,
321
307
key_level = 0 )
322
308
323
- def get_saved_queries (self , test = False ):
309
+ def get_saved_queries (self ):
324
310
"""Get all saved queries
325
311
326
312
Keyword arguments:
327
313
query_name(string) -- The name of the saved query
328
- test(bool) -- if true will use tests end-point (default False)
329
314
"""
330
- base_url = self ._wrapper_test (test )
315
+ base_url = self ._wrapper_test ()
331
316
url = base_url + URLResources .QUERY_SAVED
332
317
return self ._make_request (
333
318
url = url ,
334
319
req_type = "get" ,
335
320
key_level = 2 )
336
321
337
- def delete_saved_query (self , query_name , test = False ):
322
+ def delete_saved_query (self , query_name ):
338
323
"""Delete a saved query
339
324
340
325
Keyword arguments:
341
326
query_name(string) -- The name of the saved query
342
- test(bool) -- if true will use tests end-point (default False)
343
327
"""
344
- base_url = self ._wrapper_test (test )
328
+ base_url = self ._wrapper_test ()
345
329
url = base_url + URLResources .QUERY_SAVED + query_name
346
330
return self ._make_request (
347
331
url = url ,
348
332
req_type = "delete" ,
349
333
key_level = 2
350
334
)
351
335
352
- def create_saved_query (self , query , test = False ):
336
+ def create_saved_query (self , query ):
353
337
"""Get a list of queries saved
354
338
355
339
Keyword arguments:
356
340
query -- A dictionary query
357
- test(bool) -- if true will use tests end-point (default False)
358
341
"""
359
- base_url = self ._wrapper_test (test )
342
+ base_url = self ._wrapper_test ()
360
343
url = base_url + URLResources .QUERY_SAVED
361
344
return self ._saved_query_wrapper (url , query )
362
345
363
- def update_saved_query (self , name , query , test = False ):
346
+ def update_saved_query (self , name , query ):
364
347
"""Get a list of queries saved
365
348
366
349
Keyword arguments:
367
350
name -- The name of the saved query to update
368
351
query -- A dictionary query
369
- test(bool) -- if true will use tests end-point (default False)
370
352
"""
371
- base_url = self ._wrapper_test (test )
353
+ base_url = self ._wrapper_test ()
372
354
url = base_url + URLResources .QUERY_SAVED + name
373
355
return self ._saved_query_wrapper (url , query , True )
374
356
375
- def result (self , query , test = False ):
357
+ def result (self , query ):
376
358
"""Get a data extraction result
377
359
378
360
Keyword arguments:
379
361
query -- A dictionary query
380
- test(bool) -- if true will use tests end-point (default False)
381
362
"""
382
- base_url = self ._wrapper_test (test )
363
+ base_url = self ._wrapper_test ()
383
364
url = base_url + URLResources .QUERY_DATA_EXTRACTION_RESULT
384
365
return self ._data_extraction_wrapper (url , query )
385
366
386
- def score (self , query , test = False ):
367
+ def score (self , query ):
387
368
"""Get a data extraction score
388
369
389
370
Keyword arguments:
390
371
query -- A dictionary query
391
- test(bool) -- if true will use tests end-point (default False)
392
372
"""
393
- base_url = self ._wrapper_test (test )
373
+ base_url = self ._wrapper_test ()
394
374
url = base_url + URLResources .QUERY_DATA_EXTRACTION_SCORE
395
375
return self ._data_extraction_wrapper (url , query )
0 commit comments