Merge branch 'fixes-0.9.1' into staging

Author: smithara

viresclient/__init__.py

@@ -36,4 +36,5 @@
 from ._api.token import TokenManager
 from . import _data
 
-__version__ = "0.9.1-dev-conjunctions"
+
+__version__ = "0.9.1"

viresclient/_client.py

@@ -247,13 +247,13 @@ class ClientRequest(object):
     """Base class handling the requests to and downloads from the server.
     """
 
-    def __init__(self, url=None, username=None, password=None, token=None,
+    def __init__(self, url=None, token=None,
                  config=None, logging_level="NO_LOGGING", server_type=None):
 
         # Check and prompt for token if not already set, then store in config
         # Try to only do this if running in a notebook
         if IN_JUPYTER:
-            if not ((username and password) or token or config):
+            if not (token or config):
                 cc = ClientConfig()
                 # Use production url if none chosen
                 url = url or cc.default_url or "https://vires.services/ows"
@@ -275,7 +275,7 @@ def __init__(self, url=None, username=None, password=None, token=None,
         set_stream_handler(self._logger, logging_level)
 
         self._wps_service = self._create_service_proxy_(
-            config, url, username, password, token
+            config, url, None, None, token
         )
         # Test if the token is working; re-enter if not
         if IN_JUPYTER:
@@ -292,7 +292,7 @@ def __init__(self, url=None, username=None, password=None, token=None,
                         raise AuthenticationError(AUTH_ERROR_TEXT)
                     set_token(url)
                     self._wps_service = self._create_service_proxy_(
-                        config, url, username, password, token
+                        config, url, None, None, token
                     )
 
     def _create_service_proxy_(self, config, url, username, password, token):

viresclient/_client_swarm.py

@@ -402,8 +402,6 @@ class SwarmRequest(ClientRequest):
 
     Args:
         url (str):
-        username (str):
-        password (str):
         token (str):
         config (str or ClientConfig):
         logging_level (str):
@@ -733,7 +731,7 @@ class SwarmRequest(ClientRequest):
             "B_FGM1", "B_FGM2", "B_FGM3", "q_NEC_CRF", "q_error",
         ],
         "MAG_GRACE": [
-            "F", "B_NEC", "B_NEC_raw", "B_FGM", "B_mod_NEC",
+            "F", "B_NEC", "B_NEC_raw", "B_FGM",
             "q_NEC_CRF", "q_error",
         ],
         "MAG_GFO": [
@@ -775,10 +773,10 @@ class SwarmRequest(ClientRequest):
         "MCO_SHA_2X", "CHAOS", "CHAOS-MMA", "MMA_SHA_2C", "MMA_SHA_2F", "MIO_SHA_2C", "MIO_SHA_2D", "SwarmCI",
     ]
 
-    def __init__(self, url=None, username=None, password=None, token=None,
+    def __init__(self, url=None, token=None,
                  config=None, logging_level="NO_LOGGING"):
         super().__init__(
-            url, username, password, token, config, logging_level,
+            url, token, config, logging_level,
             server_type="Swarm"
             )
 

viresclient/_data_handling.py

@@ -296,40 +296,45 @@ def reshape_dataset(ds):
         # Create integer "Site" identifier based on SiteCode / IAGA_code
         sites = dict(enumerate(sorted(set(ds[codevar].values))))
         sites_inv = {v: k for k, v in sites.items()}
-        # Identify (V)OBS locations and mapping from integer "Site" identifier
-        pos_vars = ["Longitude", "Latitude", "Radius", codevar]
-        _ds_locs = next(iter(ds[pos_vars].groupby("Timestamp")))[1]
-        if len(sites) > 1:
-            _ds_locs = _ds_locs.drop(("Timestamp")).rename({"Timestamp": "Site"})
+        if len(sites) == 0:
+            _ds_locs = ds
         else:
-            _ds_locs = _ds_locs.drop(("Timestamp")).expand_dims("Site")
-        _ds_locs["Site"] = [sites_inv.get(code) for code in _ds_locs[codevar].values]
-        _ds_locs = _ds_locs.sortby("Site")
+            # Identify (V)OBS locations and mapping from integer "Site" identifier
+            pos_vars = ["Longitude", "Latitude", "Radius", codevar]
+            _ds_locs = next(iter(ds[pos_vars].groupby("Timestamp")))[1]
+            if len(sites) > 1:
+                _ds_locs = _ds_locs.drop(("Timestamp")).rename({"Timestamp": "Site"})
+            else:
+                _ds_locs = _ds_locs.drop(("Timestamp")).expand_dims("Site")
+            _ds_locs["Site"] = [sites_inv.get(code) for code in _ds_locs[codevar].values]
+            _ds_locs = _ds_locs.sortby("Site")
         # Create dataset initialised with the (V)OBS positional info as coords
         # and datavars (empty) reshaped to (Site, Timestamp, ...)
         t = numpy.unique(ds["Timestamp"])
         ds2 = xarray.Dataset(
             coords={
                 "Timestamp": t,
-                codevar: (("Site"), _ds_locs[codevar]),
-                "Latitude": ("Site", _ds_locs["Latitude"]),
-                "Longitude": ("Site", _ds_locs["Longitude"]),
-                "Radius": ("Site", _ds_locs["Radius"]),
+                codevar: (("Site"), _ds_locs[codevar].data),
+                "Latitude": ("Site", _ds_locs["Latitude"].data),
+                "Longitude": ("Site", _ds_locs["Longitude"].data),
+                "Radius": ("Site", _ds_locs["Radius"].data),
                 "NEC": ["N", "E", "C"]
             },
         )
         # (Dropping unused Spacecraft var)
         data_vars = set(ds.data_vars) - {"Latitude", "Longitude", "Radius", codevar, "Spacecraft"}
         N_sites = len(_ds_locs[codevar])
+        # Create empty data variables to be infilled
         for var in data_vars:
             shape = [N_sites, len(t), *ds[var].shape[1:]]
             ds2[var] = ("Site", *ds[var].dims), numpy.empty(shape, dtype=ds[var].dtype)
             ds2[var][...] = None
-        # Loop through each (V)OBS site to insert the datavars into ds2
-        for k, _ds in dict(ds.groupby(codevar)).items():
-            site = sites_inv.get(k)
-            for var in data_vars:
-                ds2[var][site, ...] = _ds[var].values
+        # Loop through each (V)OBS site to infill the data
+        if N_sites != 0:
+            for k, _ds in dict(ds.groupby(codevar)).items():
+                site = sites_inv.get(k)
+                for var in data_vars:
+                    ds2[var][site, ...] = _ds[var].values
         # Revert to using only the "SiteCode"/"IAGA_code" identifier
         ds2 = ds2.set_index({"Site": codevar})
         ds2 = ds2.rename({"Site": codevar})