Merge pull request #176 from thopp-tudelft/session

remove session object from being created on import

Author: RussTorres

renderapi/coordinate.py

@@ -6,7 +6,6 @@
 from .utils import NullHandler, renderdumps, renderdump, get_json
 from .client import coordinateClient
 from .errors import RenderError
-import requests
 import json
 import numpy as np
 import logging
@@ -20,7 +19,7 @@
 @renderaccess
 def world_to_local_coordinates(stack, z, x, y, host=None,
                                port=None, owner=None, project=None,
-                               session=requests.session(),
+                               session=None,
                                render=None, **kwargs):
     """maps an world x,y,z coordinate in stack to a local coordinate
     Parameters
@@ -64,7 +63,7 @@ def world_to_local_coordinates(stack, z, x, y, host=None,
 @renderaccess
 def local_to_world_coordinates(stack, tileId, x, y,
                                host=None, port=None, owner=None, project=None,
-                               session=requests.session(),
+                               session=None,
                                render=None, **kwargs):
     """convert coordinate from local to world with webservice request
 
@@ -110,7 +109,7 @@ def local_to_world_coordinates(stack, tileId, x, y,
 def world_to_local_coordinates_batch(stack, d, z, host=None,
                                      port=None, owner=None, project=None,
                                      execute_local=False,
-                                     session=requests.session(),
+                                     session=None,
                                      render=None, **kwargs):
 
     """convert coordinate parameters from world to local
@@ -174,7 +173,7 @@ def world_to_local_coordinates_batch(stack, d, z, host=None,
 @renderaccess
 def local_to_world_coordinates_batch(stack, d, z, host=None,
                                      port=None, owner=None, project=None,
-                                     session=requests.session(),
+                                     session=None,
                                      render=None, **kwargs):
     """convert coordinate parameters from local to world
 
@@ -302,7 +301,7 @@ def unpackage_world_to_local_point_match_from_json(json_answer, tileId):
 # def old_world_to_local_coordinates_array(stack, dataarray, tileId, z=0,
 #                                          host=None, port=None,
 #                                          owner=None, project=None,
-#                                          session=requests.session(),
+#                                          session=None,
 #                                          render=None, **kwargs):
 #     ''''''
 
@@ -359,7 +358,7 @@ def world_to_local_coordinates_array(stack, dataarray, tileId, z,
                                      owner=None, project=None,
                                      client_script=None,
                                      doClientSide=False, number_of_threads=20,
-                                     session=requests.session(), **kwargs):
+                                     session=None, **kwargs):
     """map world to local coordinates using numpy array
 
     Parameters
@@ -403,7 +402,7 @@ def world_to_local_coordinates_array(stack, dataarray, tileId, z,
 # def old_local_to_world_coordinates_array(stack, dataarray, tileId, z=0,
 #                                          host=None, port=None,
 #                                          owner=None, project=None,
-#                                          session=requests.session(),
+#                                          session=None,
 #                                          render=None, **kwargs):
 #     ''''''
 #     request_url = format_preamble(
@@ -439,7 +438,7 @@ def local_to_world_coordinates_array(stack, dataarray, tileId, z,
                                      owner=None, project=None,
                                      client_script=None,
                                      doClientSide=False, number_of_threads=20,
-                                     session=requests.session(), **kwargs):
+                                     session=None, **kwargs):
     """map local to world coordinates using numpy array
 
     Parameters

renderapi/image.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 import io
-import requests
 from PIL import Image
 import numpy as np
 import logging
@@ -36,7 +35,7 @@ def get_bb_renderparams(stack, z, x, y, width, height, scale=1.0,
                         binaryMask=None, filter=None, filterListName=None,
                         convertToGray=None, excludeMask=None,
                         host=None, port=None, owner=None,
-                        project=None, session=requests.session(),
+                        project=None, session=None,
                         render=None, **kwargs):
 
     request_url = format_preamble(
@@ -63,7 +62,7 @@ def get_bb_image(stack, z, x, y, width, height, scale=1.0,
                  minIntensity=None, maxIntensity=None, binaryMask=None,
                  filter=None, maxTileSpecsToRender=None,
                  host=None, port=None, owner=None, project=None,
-                 img_format=None, session=requests.session(),
+                 img_format=None, session=None,
                  render=None, **kwargs):
     """render image from a bounding box defined in xy and return numpy array:
 
@@ -150,7 +149,7 @@ def get_tile_renderparams(
         filter=None, filterListName=None, excludeMask=None, convertToGray=None,
         binaryMask=None, host=None, port=None, owner=None,
         project=None, img_format=None,
-        session=requests.session(), render=None, **kwargs):
+        session=None, render=None, **kwargs):
     request_url = format_preamble(
         host, port, owner, project, stack) + \
         "/tile/%s/render-parameters" % (
@@ -182,7 +181,7 @@ def get_tile_image_data(stack, tileId, channel=None, normalizeForMatching=True,
                         minIntensity=None, maxIntensity=None,
                         filter=None, host=None, port=None, owner=None,
                         project=None, img_format=None,
-                        session=requests.session(), render=None, **kwargs):
+                        session=None, render=None, **kwargs):
     """render image from a tile with all transforms and return numpy array
 
     :func:`renderapi.render.renderaccess` decorated function
@@ -273,7 +272,7 @@ def get_section_renderparams(stack, z, binaryMask=None, channel=None,
                              filterListName=None, minIntensity=None,
                              maxIntensity=None, scale=None,
                              host=None, port=None, owner=None, project=None,
-                             session=requests.session(),
+                             session=None,
                              render=None, **kwargs):
     request_url = format_preamble(
         host, port, owner, project, stack) + "/z/{}/render-parameters".format(
@@ -299,7 +298,7 @@ def get_section_image(stack, z, scale=1.0, channel=None,
                       filter=False,
                       maxTileSpecsToRender=None, img_format=None,
                       host=None, port=None, owner=None, project=None,
-                      session=requests.session(),
+                      session=None,
                       render=None, **kwargs):
     """render an section of image
 
@@ -371,7 +370,7 @@ def get_section_image(stack, z, scale=1.0, channel=None,
 @renderaccess
 def get_renderparameters_image(renderparams, img_format=None,
                                host=None, port=None, owner=None,
-                               session=requests.session(),
+                               session=None,
                                render=None, **kwargs):
     try:
         image_ext = IMAGE_FORMATS[img_format]

renderapi/pointmatch.py

@@ -2,7 +2,6 @@
 '''
 Point Match APIs
 '''
-import requests
 import logging
 from .render import format_baseurl, renderaccess
 from .utils import NullHandler, get_json, put_json, rest_delete
@@ -90,7 +89,7 @@ def swap_matchpair(match, copy=True):
 
 @renderaccess
 def get_matchcollection_owners(host=None, port=None,
-                               session=requests.session(),
+                               session=None,
                                render=None, **kwargs):
 
     """get all the matchCollection owners
@@ -121,7 +120,7 @@ def get_matchcollection_owners(host=None, port=None,
 
 @renderaccess
 def get_matchcollections(owner=None, host=None, port=None,
-                         session=requests.session(), render=None, **kwargs):
+                         session=None, render=None, **kwargs):
     """get all the matchCollections owned by owner
 
     :func:`renderapi.render.renderaccess` decorated function
@@ -153,7 +152,7 @@ def get_matchcollections(owner=None, host=None, port=None,
 
 @renderaccess
 def get_match_groupIds(matchCollection, owner=None, host=None,
-                       port=None, session=requests.session(),
+                       port=None, session=None,
                        render=None, **kwargs):
     """get all the groupIds in a matchCollection
 
@@ -190,7 +189,7 @@ def get_match_groupIds(matchCollection, owner=None, host=None,
 def get_matches_outside_group(matchCollection, groupId, mergeCollections=None,
                               stream=True,
                               owner=None, host=None,
-                              port=None, session=requests.session(),
+                              port=None, session=None,
                               render=None, **kwargs):
     """get all the matches outside a groupId in a matchCollection
     returns all matches where pGroupId == groupId and qGroupId != groupId
@@ -237,7 +236,7 @@ def get_matches_outside_group(matchCollection, groupId, mergeCollections=None,
 def get_matches_within_group(matchCollection, groupId, mergeCollections=None,
                              stream=True,
                              owner=None, host=None, port=None,
-                             session=requests.session(),
+                             session=None,
                              render=None, **kwargs):
     """get all the matches within a groupId in a matchCollection
     returns all matches where pGroupId == groupId and qGroupId == groupId
@@ -286,7 +285,7 @@ def get_matches_from_group_to_group(matchCollection, pgroup, qgroup,
                                     mergeCollections=None, stream=True,
                                     render=None, owner=None, host=None,
                                     port=None,
-                                    session=requests.session(), **kwargs):
+                                    session=None, **kwargs):
     """get all the matches between two specific groups
     returns all matches where pgroup == pGroupId and qgroup == qGroupId
     OR pgroup == qGroupId and qgroup == pGroupId
@@ -360,7 +359,7 @@ def get_matches_from_tile_to_tile(matchCollection, pgroup, pid,
                                   qgroup, qid, mergeCollections=None,
                                   render=None, owner=None,
                                   host=None, port=None,
-                                  session=requests.session(), **kwargs):
+                                  session=None, **kwargs):
     """get all the matches between two specific tiles
     returns all matches where
     pgroup == pGroupId and pid=pId and qgroup == qGroupId and qid == qId
@@ -415,7 +414,7 @@ def get_matches_with_group(matchCollection, pgroup, mergeCollections=None,
                            stream=True,
                            render=None, owner=None,
                            host=None, port=None,
-                           session=requests.session(), **kwargs):
+                           session=None, **kwargs):
     """get all the matches from a specific groups
     returns all matches where pgroup == pGroupId
 
@@ -461,7 +460,7 @@ def get_matches_with_group(matchCollection, pgroup, mergeCollections=None,
 def get_match_groupIds_from_only(matchCollection, mergeCollections=None,
                                  render=None, owner=None,
                                  host=None, port=None,
-                                 session=requests.session(), **kwargs):
+                                 session=None, **kwargs):
     """get all the source pGroupIds in a matchCollection
 
     :func:`renderapi.render.renderaccess` decorated function
@@ -499,7 +498,7 @@ def get_match_groupIds_from_only(matchCollection, mergeCollections=None,
 def get_match_groupIds_to_only(matchCollection, mergeCollections=None,
                                render=None, owner=None,
                                host=None, port=None,
-                               session=requests.session(), **kwargs):
+                               session=None, **kwargs):
     """get all the destination qGroupIds in a matchCollection
 
     :func:`renderapi.render.renderaccess` decorated function
@@ -538,7 +537,7 @@ def get_match_groupIds_to_only(matchCollection, mergeCollections=None,
 def get_matches_involving_tile(matchCollection, groupId, id,
                                mergeCollections=None, stream=True,
                                owner=None, host=None, port=None,
-                               session=requests.session(), **kwargs):
+                               session=None, **kwargs):
     """get all the matches involving a specific tile
      returns all matches where groupId == pGroupId and id == pId
      OR groupId == qGroupId and id == qId
@@ -586,7 +585,7 @@ def get_matches_involving_tile(matchCollection, groupId, id,
 @renderaccess
 def delete_point_matches_between_groups(matchCollection, pGroupId, qGroupId,
                                         render=None, owner=None, host=None,
-                                        port=None, session=requests.session(),
+                                        port=None, session=None,
                                         **kwargs):
     """delete all the matches between two specific groups
     deletes all matches where (pgroup == pGroupId and qgroup == qGroupId)
@@ -631,7 +630,7 @@ def delete_point_matches_between_groups(matchCollection, pGroupId, qGroupId,
 
 @renderaccess
 def import_matches(matchCollection, data, owner=None, host=None, port=None,
-                   session=requests.session(), render=None, **kwargs):
+                   session=None, render=None, **kwargs):
     """import matches into render database
 
     :func:`renderapi.render.renderaccess` decorated function
@@ -664,7 +663,7 @@ def import_matches(matchCollection, data, owner=None, host=None, port=None,
 
 @renderaccess
 def delete_collection(matchCollection, owner=None, host=None, port=None,
-                      session=requests.session(), render=None, **kwargs):
+                      session=None, render=None, **kwargs):
     """delete match collection from render database
 
     :func:`renderapi.render.renderaccess` decorated function