Adding support for S3 files in GPFile objects

genepattern · Jul 14, 2021 · 808d3cf · 808d3cf
1 parent 9223522
commit 808d3cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/gp/__init__.py b/gp/__init__.py
@@ -13,11 +13,3 @@
 
 # Import core functionality
 from .core import GPException, GPFile, GPJob, GPJobSpec, GPResource, GPServer, GPTask, GPTaskParam, GPJSONEncoder
-
-# Import subpackages, if available
-try:
-    import gp.utils
-except Exception:
-    # Ignore if subpackages are unavailable
-    True
-
diff --git a/gp/core.py b/gp/core.py
@@ -258,7 +258,13 @@ def open(self):
         if self.server_data.authorization_header() is not None:
             request.add_header('Authorization', self.server_data.authorization_header())
         request.add_header('User-Agent', 'GenePatternRest')
-        return urllib.request.urlopen(request)
+        try:
+            return urllib.request.urlopen(request)
+        except urllib.error.HTTPError as e:
+            if e.geturl():  # Handle S3 redirects if one is encountered
+                return urllib.request.urlopen(urllib.request.Request(e.geturl()))
+            else:
+                raise e
 
     def read(self):
         """