Added another check in get_hap_hst_link, fixed code style

Author: javier-ballester

astroquery/esa/hubble/core.py

@@ -148,8 +148,9 @@ def get_hap_hst_link(self, observation_id):
         if observation_id is None:
             raise ValueError(self.REQUESTED_OBSERVATION_ID)
         observation_type = self.get_observation_type(observation_id)
-
-        if 'HAP' in observation_type:
+        if 'Composite' in observation_type:
+            raise ValueError("HAP-HST link is only available for simple observations. Input observation is Composite.")
+        elif 'HAP' in observation_type:
             oids = self._select_members(observation_id)
         elif 'HST' in observation_type:
             query = f"select observation_id from ehst.observation where obs_type='HAP Simple' and members like '%{observation_id}%'"

astroquery/esa/hubble/tests/test_esa_hubble.py

@@ -73,6 +73,7 @@ class MockResponse:
     def pformat():
         return True
 
+
 class TestESAHubble:
 
     def get_dummy_tap_handler(self):
@@ -570,6 +571,14 @@ def test_get_hap_hst_link_attributeerror(self):
             dummy_obs_id = None
             ehst.get_hap_hst_link(dummy_obs_id)
 
+    @patch.object(ESAHubbleClass, 'get_observation_type')
+    def test_get_hap_hst_link_compositeerror(self, mock_observation_type):
+        with pytest.raises(ValueError):
+            mock_observation_type.return_value = "HAP Composite"
+            ehst = ESAHubbleClass(self.get_dummy_tap_handler())
+            dummy_obs_id = "1234"
+            ehst.get_hap_hst_link(dummy_obs_id)
+
     @patch.object(ESAHubbleClass, '_select_members')
     @patch.object(ESAHubbleClass, 'get_observation_type')
     def test_get_member_observations_composite(self, mock_observation_type, mock_select_members):

astroquery/esa/hubble/tests/test_esa_hubble_remote.py

@@ -115,10 +115,11 @@ def test_hst_simple_to_hap_simple(self):
         result = esa_hubble.get_hap_hst_link('jec071i9q')
         assert result == ['hst_16316_71_acs_sbc_f150lp_jec071i9']
 
+
 """
     def test_query_target(self):
         temp_file = self.temp_folder.name + "/" + "m31_query.xml"
-        table = esa_hubble.query_target("m31", temp_file)
+        table = esa_hubble.query_target("m3", temp_file)
         assert os.path.exists(temp_file)
         assert 'OBSERVATION_ID' in table.columns
 """

docs/esa/hubble.rst

@@ -339,6 +339,39 @@ votable). The result of the query will be stored in the file
 result.get_results() or printing it by doing print(result).
 
 
+-------------------------------
+9. Getting related members of HAP and HST observations
+-------------------------------
+
+This function takes in an observation id of a Composite or Simple observation.
+If the observation is Simple the method returns the Composite observation that
+is built on this simple observation. If the observation is Composite then the
+method returns the simple observations that make it up.
+
+.. code-block:: python
+
+  >>> from astroquery.esa.hubble import ESAHubble
+  >>> esahubble = ESAHubble()
+  >>> result = esahubble.get_member_observations("jdrz0c010")
+  >>> print(result)
+
+
+-------------------------------
+10. Getting link between Simple HAP and HST observations
+-------------------------------
+
+This function takes in an observation id of a Simple HAP or HST observation and
+returns the corresponding HAP or HST observation
+
+.. code-block:: python
+
+  >>> from astroquery.esa.hubble import ESAHubble
+  >>> esahubble = ESAHubble()
+  >>> result = esahubble.get_hap_hst_link("hst_16316_71_acs_sbc_f150lp_jec071i9")
+  >>> print(result)
+
+
+
 Reference/API
 =============