Merge pull request #57 from nova-model/56-check-for-redirects-from-the-galaxy-url-before-connecting

Follow redirects

Author: evilkermit

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Nova Galaxy 0.12.0 (in progress)
 
+### Nova Galaxy 0.11.4
+- Allows connecting to a Galaxy URL that returns a redirect (thanks to John Duggan). [Pull request 57](https://github.com/nova-model/nova-galaxy/pull/57)
+
+### Nova Galaxy 0.11.3
+- Minor fixes for workflow parameters (thanks to Andrew Ayres). [Pull request 53](https://github.com/nova-model/nova-galaxy/pull/53)
+
+### Nova Galaxy 0.11.2
+- Workflow parameters are now more explicitly defined (thanks to Andrew Ayres). [Commit](https://github.com/nova-model/nova-galaxy/commit/fc7ca763c400698e51f81c99764bb8c696b6ecca)
+
 ### Nova Galaxy 0.11.1
 - Improved the performance of Job.get_url when check_url parameter is set to False (thanks to John Duggan). [Pull request 43](https://github.com/nova-model/nova-galaxy/pull/43)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nova-galaxy"
-version = "0.11.3"
+version = "0.11.4"
 description = "Utilties for accessing the ORNL Galaxy instance"
 authors = [
     { name = "Greg Watson", email = "watsongr@ornl.gov" },

src/nova/galaxy/connection.py

@@ -1,9 +1,11 @@
 """The NOVA class is responsible for managing interactions with a Galaxy server instance."""
 
 from typing import Any, List
+from urllib.parse import urlparse
 
 from bioblend import galaxy
 from deprecated import deprecated
+from requests import head
 
 from .data_store import Datastore
 from .tool import stop_all_tools_in_store
@@ -137,8 +139,8 @@ class Connection:
 
     Attributes
     ----------
-        galaxy_url (Optional[str]): URL of the Galaxy instance.
-        galaxy_api_key (Optional[str]): API key for the Galaxy instance.
+        galaxy_url (str): URL of the Galaxy instance.
+        galaxy_api_key (str): API key for the Galaxy instance.
     """
 
     def __init__(
@@ -153,7 +155,13 @@ def __init__(
             galaxy_url str: URL of the Galaxy instance.
             galaxy_key str: API key for the Galaxy instance.
         """
-        self.galaxy_url = galaxy_url
+        # Check for redirects on the URL and follow them to the final Galaxy URL.
+        response = head(galaxy_url, allow_redirects=True)
+        resolved_url = response.url
+        parsed_url = urlparse(resolved_url)
+        new_galaxy_url = f"{parsed_url.scheme}://{parsed_url.hostname}"
+
+        self.galaxy_url = new_galaxy_url
         self.galaxy_api_key = galaxy_key
         self.galaxy_instance: galaxy.GalaxyInstance