Skip to content

Commit 1e596aa

Browse files
thopp-tudelftthopp-tudelft
committed
remove session object from being created on import
1 parent bcfaed8 commit 1e596aa

File tree

7 files changed

+70
-63
lines changed

7 files changed

+70
-63
lines changed

‎renderapi/coordinate.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@renderaccess
2121
def world_to_local_coordinates(stack, z, x, y, host=None,
2222
port=None, owner=None, project=None,
23-
session=requests.session(),
23+
session=None,
2424
render=None, **kwargs):
2525
"""maps an world x,y,z coordinate in stack to a local coordinate
2626
Parameters
@@ -64,7 +64,7 @@ def world_to_local_coordinates(stack, z, x, y, host=None,
6464
@renderaccess
6565
def local_to_world_coordinates(stack, tileId, x, y,
6666
host=None, port=None, owner=None, project=None,
67-
session=requests.session(),
67+
session=None,
6868
render=None, **kwargs):
6969
"""convert coordinate from local to world with webservice request
7070
@@ -110,7 +110,7 @@ def local_to_world_coordinates(stack, tileId, x, y,
110110
def world_to_local_coordinates_batch(stack, d, z, host=None,
111111
port=None, owner=None, project=None,
112112
execute_local=False,
113-
session=requests.session(),
113+
session=None,
114114
render=None, **kwargs):
115115

116116
"""convert coordinate parameters from world to local
@@ -174,7 +174,7 @@ def world_to_local_coordinates_batch(stack, d, z, host=None,
174174
@renderaccess
175175
def local_to_world_coordinates_batch(stack, d, z, host=None,
176176
port=None, owner=None, project=None,
177-
session=requests.session(),
177+
session=None,
178178
render=None, **kwargs):
179179
"""convert coordinate parameters from local to world
180180
@@ -302,7 +302,7 @@ def unpackage_world_to_local_point_match_from_json(json_answer, tileId):
302302
# def old_world_to_local_coordinates_array(stack, dataarray, tileId, z=0,
303303
# host=None, port=None,
304304
# owner=None, project=None,
305-
# session=requests.session(),
305+
# session=None,
306306
# render=None, **kwargs):
307307
# ''''''
308308

@@ -359,7 +359,7 @@ def world_to_local_coordinates_array(stack, dataarray, tileId, z,
359359
owner=None, project=None,
360360
client_script=None,
361361
doClientSide=False, number_of_threads=20,
362-
session=requests.session(), **kwargs):
362+
session=None, **kwargs):
363363
"""map world to local coordinates using numpy array
364364
365365
Parameters
@@ -403,7 +403,7 @@ def world_to_local_coordinates_array(stack, dataarray, tileId, z,
403403
# def old_local_to_world_coordinates_array(stack, dataarray, tileId, z=0,
404404
# host=None, port=None,
405405
# owner=None, project=None,
406-
# session=requests.session(),
406+
# session=None,
407407
# render=None, **kwargs):
408408
# ''''''
409409
# request_url = format_preamble(
@@ -439,7 +439,7 @@ def local_to_world_coordinates_array(stack, dataarray, tileId, z,
439439
owner=None, project=None,
440440
client_script=None,
441441
doClientSide=False, number_of_threads=20,
442-
session=requests.session(), **kwargs):
442+
session=None, **kwargs):
443443
"""map local to world coordinates using numpy array
444444
445445
Parameters

‎renderapi/image.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def get_bb_renderparams(stack, z, x, y, width, height, scale=1.0,
3636
binaryMask=None, filter=None, filterListName=None,
3737
convertToGray=None, excludeMask=None,
3838
host=None, port=None, owner=None,
39-
project=None, session=requests.session(),
39+
project=None, session=None,
4040
render=None, **kwargs):
4141

4242
request_url = format_preamble(
@@ -63,7 +63,7 @@ def get_bb_image(stack, z, x, y, width, height, scale=1.0,
6363
minIntensity=None, maxIntensity=None, binaryMask=None,
6464
filter=None, maxTileSpecsToRender=None,
6565
host=None, port=None, owner=None, project=None,
66-
img_format=None, session=requests.session(),
66+
img_format=None, session=None,
6767
render=None, **kwargs):
6868
"""render image from a bounding box defined in xy and return numpy array:
6969
@@ -150,7 +150,7 @@ def get_tile_renderparams(
150150
filter=None, filterListName=None, excludeMask=None, convertToGray=None,
151151
binaryMask=None, host=None, port=None, owner=None,
152152
project=None, img_format=None,
153-
session=requests.session(), render=None, **kwargs):
153+
session=None, render=None, **kwargs):
154154
request_url = format_preamble(
155155
host, port, owner, project, stack) + \
156156
"/tile/%s/render-parameters" % (
@@ -182,7 +182,7 @@ def get_tile_image_data(stack, tileId, channel=None, normalizeForMatching=True,
182182
minIntensity=None, maxIntensity=None,
183183
filter=None, host=None, port=None, owner=None,
184184
project=None, img_format=None,
185-
session=requests.session(), render=None, **kwargs):
185+
session=None, render=None, **kwargs):
186186
"""render image from a tile with all transforms and return numpy array
187187
188188
:func:`renderapi.render.renderaccess` decorated function
@@ -273,7 +273,7 @@ def get_section_renderparams(stack, z, binaryMask=None, channel=None,
273273
filterListName=None, minIntensity=None,
274274
maxIntensity=None, scale=None,
275275
host=None, port=None, owner=None, project=None,
276-
session=requests.session(),
276+
session=None,
277277
render=None, **kwargs):
278278
request_url = format_preamble(
279279
host, port, owner, project, stack) + "/z/{}/render-parameters".format(
@@ -299,7 +299,7 @@ def get_section_image(stack, z, scale=1.0, channel=None,
299299
filter=False,
300300
maxTileSpecsToRender=None, img_format=None,
301301
host=None, port=None, owner=None, project=None,
302-
session=requests.session(),
302+
session=None,
303303
render=None, **kwargs):
304304
"""render an section of image
305305
@@ -371,7 +371,7 @@ def get_section_image(stack, z, scale=1.0, channel=None,
371371
@renderaccess
372372
def get_renderparameters_image(renderparams, img_format=None,
373373
host=None, port=None, owner=None,
374-
session=requests.session(),
374+
session=None,
375375
render=None, **kwargs):
376376
try:
377377
image_ext = IMAGE_FORMATS[img_format]

‎renderapi/pointmatch.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def swap_matchpair(match, copy=True):
9090

9191
@renderaccess
9292
def get_matchcollection_owners(host=None, port=None,
93-
session=requests.session(),
93+
session=None,
9494
render=None, **kwargs):
9595

9696
"""get all the matchCollection owners
@@ -121,7 +121,7 @@ def get_matchcollection_owners(host=None, port=None,
121121

122122
@renderaccess
123123
def get_matchcollections(owner=None, host=None, port=None,
124-
session=requests.session(), render=None, **kwargs):
124+
session=None, render=None, **kwargs):
125125
"""get all the matchCollections owned by owner
126126
127127
:func:`renderapi.render.renderaccess` decorated function
@@ -153,7 +153,7 @@ def get_matchcollections(owner=None, host=None, port=None,
153153

154154
@renderaccess
155155
def get_match_groupIds(matchCollection, owner=None, host=None,
156-
port=None, session=requests.session(),
156+
port=None, session=None,
157157
render=None, **kwargs):
158158
"""get all the groupIds in a matchCollection
159159
@@ -190,7 +190,7 @@ def get_match_groupIds(matchCollection, owner=None, host=None,
190190
def get_matches_outside_group(matchCollection, groupId, mergeCollections=None,
191191
stream=True,
192192
owner=None, host=None,
193-
port=None, session=requests.session(),
193+
port=None, session=None,
194194
render=None, **kwargs):
195195
"""get all the matches outside a groupId in a matchCollection
196196
returns all matches where pGroupId == groupId and qGroupId != groupId
@@ -237,7 +237,7 @@ def get_matches_outside_group(matchCollection, groupId, mergeCollections=None,
237237
def get_matches_within_group(matchCollection, groupId, mergeCollections=None,
238238
stream=True,
239239
owner=None, host=None, port=None,
240-
session=requests.session(),
240+
session=None,
241241
render=None, **kwargs):
242242
"""get all the matches within a groupId in a matchCollection
243243
returns all matches where pGroupId == groupId and qGroupId == groupId
@@ -286,7 +286,7 @@ def get_matches_from_group_to_group(matchCollection, pgroup, qgroup,
286286
mergeCollections=None, stream=True,
287287
render=None, owner=None, host=None,
288288
port=None,
289-
session=requests.session(), **kwargs):
289+
session=None, **kwargs):
290290
"""get all the matches between two specific groups
291291
returns all matches where pgroup == pGroupId and qgroup == qGroupId
292292
OR pgroup == qGroupId and qgroup == pGroupId
@@ -360,7 +360,7 @@ def get_matches_from_tile_to_tile(matchCollection, pgroup, pid,
360360
qgroup, qid, mergeCollections=None,
361361
render=None, owner=None,
362362
host=None, port=None,
363-
session=requests.session(), **kwargs):
363+
session=None, **kwargs):
364364
"""get all the matches between two specific tiles
365365
returns all matches where
366366
pgroup == pGroupId and pid=pId and qgroup == qGroupId and qid == qId
@@ -415,7 +415,7 @@ def get_matches_with_group(matchCollection, pgroup, mergeCollections=None,
415415
stream=True,
416416
render=None, owner=None,
417417
host=None, port=None,
418-
session=requests.session(), **kwargs):
418+
session=None, **kwargs):
419419
"""get all the matches from a specific groups
420420
returns all matches where pgroup == pGroupId
421421
@@ -461,7 +461,7 @@ def get_matches_with_group(matchCollection, pgroup, mergeCollections=None,
461461
def get_match_groupIds_from_only(matchCollection, mergeCollections=None,
462462
render=None, owner=None,
463463
host=None, port=None,
464-
session=requests.session(), **kwargs):
464+
session=None, **kwargs):
465465
"""get all the source pGroupIds in a matchCollection
466466
467467
:func:`renderapi.render.renderaccess` decorated function
@@ -499,7 +499,7 @@ def get_match_groupIds_from_only(matchCollection, mergeCollections=None,
499499
def get_match_groupIds_to_only(matchCollection, mergeCollections=None,
500500
render=None, owner=None,
501501
host=None, port=None,
502-
session=requests.session(), **kwargs):
502+
session=None, **kwargs):
503503
"""get all the destination qGroupIds in a matchCollection
504504
505505
:func:`renderapi.render.renderaccess` decorated function
@@ -538,7 +538,7 @@ def get_match_groupIds_to_only(matchCollection, mergeCollections=None,
538538
def get_matches_involving_tile(matchCollection, groupId, id,
539539
mergeCollections=None, stream=True,
540540
owner=None, host=None, port=None,
541-
session=requests.session(), **kwargs):
541+
session=None, **kwargs):
542542
"""get all the matches involving a specific tile
543543
returns all matches where groupId == pGroupId and id == pId
544544
OR groupId == qGroupId and id == qId
@@ -586,7 +586,7 @@ def get_matches_involving_tile(matchCollection, groupId, id,
586586
@renderaccess
587587
def delete_point_matches_between_groups(matchCollection, pGroupId, qGroupId,
588588
render=None, owner=None, host=None,
589-
port=None, session=requests.session(),
589+
port=None, session=None,
590590
**kwargs):
591591
"""delete all the matches between two specific groups
592592
deletes all matches where (pgroup == pGroupId and qgroup == qGroupId)
@@ -631,7 +631,7 @@ def delete_point_matches_between_groups(matchCollection, pGroupId, qGroupId,
631631

632632
@renderaccess
633633
def import_matches(matchCollection, data, owner=None, host=None, port=None,
634-
session=requests.session(), render=None, **kwargs):
634+
session=None, render=None, **kwargs):
635635
"""import matches into render database
636636
637637
:func:`renderapi.render.renderaccess` decorated function
@@ -664,7 +664,7 @@ def import_matches(matchCollection, data, owner=None, host=None, port=None,
664664

665665
@renderaccess
666666
def delete_collection(matchCollection, owner=None, host=None, port=None,
667-
session=requests.session(), render=None, **kwargs):
667+
session=None, render=None, **kwargs):
668668
"""delete match collection from render database
669669
670670
:func:`renderapi.render.renderaccess` decorated function

‎renderapi/render.py‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,9 @@ def renderaccess(f, *args, **kwargs):
379379
You can if you wish specify any of the arguments, in which case they
380380
will not be filled in by the default values, but you don't have to.
381381
382+
The default value for session is None, which will be replaced with a newly
383+
created requests.Session object.
384+
382385
As such, the documentation omits describing the parameters which are
383386
natural to expect will be filled in by the renderaccess decorator.
384387
@@ -400,13 +403,17 @@ def renderaccess(f, *args, **kwargs):
400403
render = kwargs.get('render')
401404
if render is not None:
402405
if isinstance(render, Render):
403-
return f(*args, **render.make_kwargs(**kwargs))
406+
kwargs = render.make_kwargs(**kwargs)
404407
else:
405408
raise ValueError(
406409
'invalid Render object type {} specified!'.format(
407410
type(render)))
408-
else:
409-
return f(*args, **kwargs)
411+
412+
session = kwargs.get("session")
413+
if session is None:
414+
kwargs["session"] = requests.Session()
415+
416+
return f(*args, **kwargs)
410417

411418

412419
def format_baseurl(host, port):
@@ -459,7 +466,7 @@ def format_preamble(host, port, owner, project, stack):
459466

460467

461468
@renderaccess
462-
def get_owners(host=None, port=None, session=requests.session(),
469+
def get_owners(host=None, port=None, session=None,
463470
render=None, **kwargs):
464471
"""return list of owners across all Projects and Stacks for a render server
465472
@@ -488,7 +495,7 @@ def get_owners(host=None, port=None, session=requests.session(),
488495

489496
@renderaccess
490497
def get_stack_metadata_by_owner(owner=None, host=None, port=None,
491-
session=requests.session(),
498+
session=None,
492499
render=None, **kwargs):
493500
"""return metadata for all stacks belonging to particular
494501
owner on render server
@@ -517,7 +524,7 @@ def get_stack_metadata_by_owner(owner=None, host=None, port=None,
517524

518525
@renderaccess
519526
def get_projects_by_owner(owner=None, host=None, port=None,
520-
session=requests.session(), render=None, **kwargs):
527+
session=None, render=None, **kwargs):
521528
"""return list of projects belonging to a single owner for render stack
522529
523530
:func:`renderaccess` decorated function
@@ -545,7 +552,7 @@ def get_projects_by_owner(owner=None, host=None, port=None,
545552

546553
@renderaccess
547554
def get_stacks_by_owner_project(owner=None, project=None, host=None,
548-
port=None, session=requests.session(),
555+
port=None, session=None,
549556
render=None, **kwargs):
550557
"""return list of stacks belonging to an owner's project on render server
551558

‎renderapi/resolvedtiles.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def combine_resolvedtiles(rts_l):
8383
def put_tilespecs(stack, resolved_tiles=None, deriveData=True,
8484
tilespecs=None, shared_transforms=None,
8585
host=None, port=None, owner=None, project=None,
86-
session=requests.session(), render=None, **kwargs):
86+
session=None, render=None, **kwargs):
8787
"""upload resolved tiles to the server
8888
8989
:func:`renderapi.render.renderaccess` decorated function
@@ -125,7 +125,7 @@ def put_tilespecs(stack, resolved_tiles=None, deriveData=True,
125125
@renderaccess
126126
def get_resolved_tiles_from_z(stack, z, host=None, port=None,
127127
owner=None, project=None,
128-
session=requests.session(),
128+
session=None,
129129
render=None, **kwargs):
130130
"""Get a set of ResolvedTiles from a specific z value.
131131
Returns a tuple of tilespecs and referenced transforms.

0 commit comments

Comments
 (0)