sparclclient 1.2.3b8__py2.py3-none-any.whl → 1.2.4b2__py2.py3-none-any.whl

sparcl/Results.py

@@ -10,7 +10,7 @@ from sparcl.utils import _AttrDict
 # from sparcl.gather_2d import bin_spectra_records
 import sparcl.exceptions as ex
 from warnings import warn
-
+import re
 
 class Results(UserList):
     def __init__(self, dict_list, client=None):
@@ -18,7 +18,7 @@ class Results(UserList):
         self.hdr = dict_list[0]
         self.recs = dict_list[1:]
         self.client = client
-        self.fields = client.fields
+        self.fields = client.fields if client else []
         self.to_science_fields()
 
         # HACK 12/14/2023 -sp- to fix UUID problem presumably
@@ -41,7 +41,25 @@ class Results(UserList):
     def info(self):
         """Info about this collection.
         e.g. Warnings, parameters used to get the collection, etc."""
-        return self.hdr
+        # Consolodate "Successfully found...." messages
+        cln_hdr = self.hdr.copy()
+        count = 0
+        success_msg = ""
+        info = []
+        for msg in cln_hdr['status']['info']:
+            if "Successfully" in msg:
+                matches = re.search('Successfully found ([0-9]*)', msg)
+                count += int(matches.groups()[0]) if len(matches.groups()) > 0 else 0  # noqa: E501
+                success_msg = msg
+            else:
+                info.append(msg)
+
+        if count > 0:
+            msg = re.sub(r'[0-9]+', str(count), success_msg, count=1)
+            info.append(msg)
+
+        cln_hdr['status']['info'] = info
+        return cln_hdr
 
     @property
     def count(self):

sparcl/__init__.py

@@ -32,4 +32,5 @@ __all__ = ["client", "align_records"]
 # __version__ = "1.2.1"
 # FIRST uncommented value will be used! (so only leave one uncommented)
 #__version__ = "1.2.2"
-__version__ = "1.2.3b8"
+#__version__ = "1.2.3"
+__version__ = "1.2.4b2"

sparcl/client.py

@@ -25,6 +25,7 @@ from warnings import warn
 import pickle
 import getpass
 import datetime
+import re
 
 #!from pathlib import Path
 import tempfile
@@ -223,7 +224,8 @@ class SparclClient:  # was SparclApi()
             msg = (
                 f"The SPARCL Client you are running expects an older "
                 f"version of the API services. "
-                f'Please upgrade to the latest "sparclclient".  '
+                f'Please upgrade to the latest "sparclclient" using  '
+                f'"pip install --upgrade sparclclient". '
                 f"The Client you are using expected version "
                 f"{SparclClient.KNOWN_GOOD_API_VERSION} but got "
                 f"{self.apiversion} from the SPARCL Server "
@@ -944,7 +946,19 @@ class SparclClient:  # was SparclApi()
             print(f'{meta["status"]}')
 
         if len(meta["status"].get("warnings", [])) > 0:
-            warn(f"{'; '.join(meta['status'].get('warnings'))}", stacklevel=2)
+            warnings = meta["status"].get("warnings")
+            if verbose:
+                print(f"There are {len(warnings)} warnings")
+            missingcount = 0
+            missing_message = re.sub(r' [0-9]+ ', ' %s ', warnings[0])
+            for i in warnings:
+                matches = re.match(r'.* ([0-9]+) out of the ([0-9]+).*', i)
+                if matches:
+                    missingcount += int(matches.groups()[0])
+
+            # using old style substitution to avoid issue with the {} in the message  # noqa: E501
+            warning_message = missing_message % (missingcount, limit, missingcount)   # noqa: E501
+            warn(warning_message, stacklevel=2)
 
         return Retrieved(results, client=self)
 

{sparclclient-1.2.3b8.dist-info → sparclclient-1.2.4b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: sparclclient
-Version: 1.2.3b8
+Version: 1.2.4b2
 Summary: A client for getting spectra and meta-data from NOIRLab.
 Author-email: "S. Pothier" <datalab-spectro@noirlab.edu>
 Description-Content-Type: text/markdown

{sparclclient-1.2.3b8.dist-info → sparclclient-1.2.4b2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-sparcl/Results.py,sha256=YFh7HmiAfjxQv1y55OHhXsJbpKBh7mn92zPJZ56gJxw,8477
-sparcl/__init__.py,sha256=iVBVop009T_D4wL9n9dgRDURmD22aU3xjE0lUXg6mXs,1055
-sparcl/client.py,sha256=jQXbJGIxId2azVjzONrR3TiGEb1x1SEk5-sGgd-Bgdw,37772
+sparcl/Results.py,sha256=vnACjm8sp7MrsJ_5LTuKMuyRWqeBJxOxQM302cHmAlk,9159
+sparcl/__init__.py,sha256=SNs4tcxCcCde6gudELUeK-CUkrk4xIpC6t_V3Nj-ogg,1078
+sparcl/client.py,sha256=r-N-vkuGASrBxsnerG-9HZkk5mHz8cFa8OWgvmxvO4E,38448
 sparcl/conf.py,sha256=GFNDelaiVIAkjNjvFlG7HAlPpU39nqZmTPohQGmOcgI,928
 sparcl/exceptions.py,sha256=ODtoGCi1HI4xwXBbbLT-gQqd9Jjb_8TmVj-Jz_b1tg4,4040
 sparcl/fields.py,sha256=NZUBqDidpbXfeX5F4b306F323xZY2CRIx8eVv-HWTVU,5127
@@ -13,7 +13,7 @@ sparcl/utils.py,sha256=pDAk9roe7ezfVohnKcLMxFjjXHkp7EQLbgVNe5sSTrk,6259
 sparcl/benchmarks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sparcl/benchmarks/benchmarks.py,sha256=OmlSdnAPLmcvGXsr-HzGyfAAcnoqlO0JQ4EIA7JGhZc,9424
 sparcl/notebooks/sparcl-examples.ipynb,sha256=gEwMKI1x7A1YsVeCsQn1QoMO0ZuIhMUAu3qedTiQ7hM,169268
-sparclclient-1.2.3b8.dist-info/LICENSE,sha256=y10EluGMCzGs9X4oYCYyix3l6u-lawB_vlGR8qe442Q,1576
-sparclclient-1.2.3b8.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-sparclclient-1.2.3b8.dist-info/METADATA,sha256=zcgO4c4-dpM7SMalWWVj1mKoNtyIOLDAw2YKGFhw1qU,680
-sparclclient-1.2.3b8.dist-info/RECORD,,
+sparclclient-1.2.4b2.dist-info/LICENSE,sha256=y10EluGMCzGs9X4oYCYyix3l6u-lawB_vlGR8qe442Q,1576
+sparclclient-1.2.4b2.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+sparclclient-1.2.4b2.dist-info/METADATA,sha256=xeMEkgdLwomPT1vCRmco2aHMo7x51CMkKFCil1-G7us,680
+sparclclient-1.2.4b2.dist-info/RECORD,,

{sparclclient-1.2.3b8.dist-info → sparclclient-1.2.4b2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any