Merge branch 'hotfixes-0.7.1' into staging

Author: smithara

viresclient/__init__.py

@@ -35,4 +35,4 @@
 from ._api.upload import DataUpload
 from ._api.token import TokenManager
 
-__version__ = "0.7.0"
+__version__ = "0.7.1-alpha.1"

viresclient/_client_swarm.py

@@ -756,7 +756,8 @@ def available_auxiliaries(self):
         return self._available["auxiliaries"]
 
     def available_observatories(
-        self, collection=None, start_time=None, end_time=None, details=False
+        self, collection, start_time=None, end_time=None,
+        details=False
     ):
         """Get list of available observatories from server.
 
@@ -780,8 +781,9 @@ def available_observatories(
             )
 
         Args:
-            collection (str): collection name (e.g. `"SW_OPER_AUX_OBSM2_"`)
-            custom_model (str): as with set_products
+            collection (str): OBS collection name, e.g. "SW_OPER_AUX_OBSM2_"
+            start_time (datetime / ISO_8601 string)
+            end_time (datetime / ISO_8601 string)
             details (bool): returns DataFrame if True
 
         Returns:
@@ -822,6 +824,7 @@ def _csv_to_df(csv_data):
         else:
             start_time, end_time = None, None
 
+        self._detect_AUX_OBS([collection])
         response = _request_get_observatories(collection, start_time, end_time)
         df = _csv_to_df(response)
         if details:
@@ -838,20 +841,20 @@ def _detect_AUX_OBS(self, collections):
         # Output notification for each of aux_type
         for aux_type in ["AUX_OBSH", "AUX_OBSM", "AUX_OBSS"]:
             if aux_type in collection_types_requested:
-                tqdm.write(
-                    dedent(
-                        f"""
+                output_text = dedent(f"""
                 Accessing INTERMAGNET and/or WDC data
                 Check usage terms at {DATA_CITATIONS.get(aux_type)}
-                """
-                    )
-                )
+                """)
+                if aux_type == "AUX_OBSH":
+                    output_text += "WARNING: AUX_OBSH is not yet public"
+                tqdm.write(output_text)
 
-    def set_collection(self, *args):
+    def set_collection(self, *args, verbose=True):
         """Set the collection(s) to use.
 
         Args:
             (str): one or several from .available_collections()
+            verbose (bool): Notify if special data terms
 
         """
         collections = [*args]
@@ -867,7 +870,8 @@ def set_collection(self, *args):
                     "Check available with SwarmRequest().available_collections()"
                     .format(collection)
                     )
-        self._detect_AUX_OBS(collections)
+        if verbose:
+            self._detect_AUX_OBS(collections)
         self._collection_list = collections
         self._request_inputs.set_collections(collections)
         return self

viresclient/_data_handling.py

@@ -160,9 +160,16 @@ def as_pandas_dataframe(self, expand=False):
         columns = set(self.variables)
         columns.remove("Timestamp")
         # Split columns according to those to be expanded into multiple columns
-        columns_to_expand = set(c for c in columns
-                                if c in DATANAMES_TO_FRAME_NAMES.keys()
-                                or "B_NEC" in c) if expand else set()
+        if expand:
+            columns_to_expand = set(c for c in columns
+                                    if c in DATANAMES_TO_FRAME_NAMES.keys()
+                                    or "B_NEC" in c)
+            # Avoid conflict with 2D AOB_FAC Quality variable
+            # when accessing AUX_OBS Quality
+            if any(["AUX_OBS" in s for s in self.sources]):
+                columns_to_expand.discard("Quality")
+        else:
+            columns_to_expand = set()
         columns_standard = columns.difference(columns_to_expand)
         # Initialise dataframe with Timestamp as index
         df = pandas.DataFrame(index=self.get_variable("Timestamp"))