Update

Some quick fixes

Author: Heptazhou

sdssv_spec_appREMOTE.py

@@ -23,7 +23,7 @@
 
 import numpy
 from astropy.convolution import Box1DKernel, convolve # type: ignore[import-untyped]
-from astropy.io.fits import BinTableHDU, FITS_rec, HDUList # type: ignore[import-untyped]
+from astropy.io.fits import BinTableHDU, FITS_rec # type: ignore[import-untyped]
 from astropy.io.fits import open as FITS
 from numpy import mean, median, ndarray, sqrt, std
 from plotly.graph_objects import Figure, Scatter # type: ignore[import-untyped]
@@ -41,18 +41,18 @@
 	from dash.dependencies import Input, Output, State
 
 
-def fetch(url: str, speclink: str, auth: None | tuple[str, str] = None) -> bytes:
+def fetch(url: str, auth: None | tuple[str, str] = None, speclink: str = "") -> bytes:
 	try:
 		rv = request("GET", url, auth=auth)
 	except ChunkedEncodingError: # Connection broken: IncompleteRead
 		rv = request("GET", url, auth=auth)
 	except ConnectionError as e: # ConnectTimeout | SSLError
 		print(e)
 		sleep(1)
-		return fetch(url, auth)
-	if (rv.status_code != 404): 
-		print(rv.status_code, url) 
-		if speclink!="": print(speclink) 
+		return fetch(url, auth, speclink)
+	if (rv.status_code != 404):
+		print(rv.status_code, url)
+		if speclink: print("   ", speclink)
 	rv.raise_for_status() # HTTPError
 	return rv.content
 def unzstd(f: str) -> bytes:
@@ -73,11 +73,11 @@ def unzstd(f: str) -> bytes:
 	if isfile(bhm_data_local):
 		try:
 			lcl_data = parse_json(unzstd(bhm_data_local))
-			rmt_meta = parse_json(fetch(remote + basename(bhm_meta_local), ""))
+			rmt_meta = parse_json(fetch(remote + basename(bhm_meta_local)))
 			if lcl_data["hdr"]["date"] >= rmt_meta["date"]: break # already latest
 		except HTTPError: break # skip update
 		except: print_exc()
-	try: write(bhm_data_local, fetch(remote + basename(bhm_data_local), ""))
+	try: write(bhm_data_local, fetch(remote + basename(bhm_data_local)))
 	except HTTPError: sleep(1) # retry after delay
 
 metadata: dict[str, list | dict | str | int] = lcl_data["hdr"]
@@ -127,7 +127,7 @@ def get(hdu: FITS_rec, col: str, default: None = None):
 
 @lru_cache(64)
 def cached_fetch(url: str, speclink: str) -> bytes:
-	return fetch(url, speclink, (username, password) if url.startswith("https://data.sdss5.org/sas/sdsswork/") else None)
+	return fetch(url, (username, password) if url.startswith("https://data.sdss5.org/sas/sdsswork/") else None, speclink)
 def locked_fetch(url: str, speclink: str) -> bytes:
 	with fetch_queue[url]: r = cached_fetch(url, speclink)
 	return r
@@ -173,7 +173,7 @@ def SDSSV_fetch(username: str, password: str, field: int | str, mjd: int, obj: i
 	url, speclink = sdss_sas_fits(field, mjd, obj, branch) # speclink added PBH 2025-11-06
 
 	numpy.seterr(divide="ignore") # Python does not comply with IEEE 754 :(
-	fits = cast(HDUList, FITS(IOBuffer(locked_fetch(url,speclink)))) # prevent duplicated requests
+	fits = FITS(IOBuffer(locked_fetch(url, speclink))) # prevent duplicated requests
 	hdu2 = fits["COADD"] if "COADD" in fits else fits[1]
 	hdu3 = fits["SPALL"] if "SPALL" in fits else fits[2] # SPECOBJ
 	assert isa(hdu2, BinTableHDU) and isa(hdu2.data, FITS_rec)
@@ -338,7 +338,11 @@ def legend(meta: Meta, base: str = "") -> str:
 			for fieldmjd in catalogs.get(f"{cat}", [0])[1:]: # {13'FIELD,5'MJD}
 				fid, mjd = divmod(abs(fieldmjd), 10**5)
 				if field != "all" and int(field) != fid: continue
-				dat = SDSSV_fetch(username, password, fid, mjd, cat)
+				try:
+					dat = SDSSV_fetch(username, password, fid, mjd, cat)
+				except Exception as e:
+					if str(e): print(e) if isa(e, HTTPError) else print_exc()
+					continue
 				meta = Meta(dat[0])
 				data.append(Data(meta, wave=dat[1], flux=dat[2], errs=dat[3], name=legend(meta)))
 				if mjd not in mjd_list: mjd_list.append(mjd)

util/sdss.py

@@ -5,7 +5,7 @@
 from .unit import deg2dms, deg2hms
 
 
-def sdss_sas_fits(field: int | str, mjd: int, obj: int | str, branch: str) -> str:
+def sdss_sas_fits(field: int | str, mjd: int, obj: int | str, branch: str) -> tuple[str, str]:
 	"""
 	A function to build the url that will be used to fetch the data.
 	"""
@@ -23,10 +23,12 @@ def sdss_sas_fits(field: int | str, mjd: int, obj: int | str, branch: str) -> st
 	else:
 		daily = "daily"
 
+	def spec(field: str, obj: int | str) -> str:
+		return f"spec-image-{field}-{mjd}-{obj}.png"
+
 	def file(field: str, obj: int | str) -> str:
 		return f"spec-{field}-{mjd}-{obj}.fits"
-	def spile(field: str, obj: int | str) -> str:
-		return f"spec-image-{field}-{mjd}-{obj}.png"
+
 	field4 = str(field).zfill(4)
 	field6 = str(field).zfill(6)
 	obj04 = str(obj).zfill( 4)
@@ -56,7 +58,6 @@ def spile(field: str, obj: int | str) -> str:
 		case _:
 			path = "https://data.sdss5.org/sas/sdsswork/bhm/boss/spectro/redux"
 
-	speclink="" # speclink added PBH 2025-11-06
 	match branch:
 		case v if fullmatch(r"v5_(\d+_\d+)", v) or v in ("26", "103", "104"):
 			url = f"{path}/{branch}/spectra/lite/{field4       }/{file(field4, obj04)}"
@@ -66,12 +67,15 @@ def spile(field: str, obj: int | str) -> str:
 			url = f"{path}/{branch}/spectra/lite/{field6 }/{mjd}/{file(field6, obj  )}"
 		case _:                                  # v6.2.0+
 			url = f"{path}/{branch}/spectra/{daily}/lite/{group}/{field6}/{mjd}/{file(field6, obj)}"
-			if (branch == "v6_2_1" or branch == "master"): # create speclink only for v6_2_1 spectra
-				speclink = f"{path}/v6_2_1/images/{daily}/v6_2_1/{group}/{field6}/{field6}-{mjd}/{spile(field6, obj)}"
-        
-	return url, speclink # speclink added PBH 2025-11-06
+	match branch: # speclink added PBH 2025-11-06
+		case "v6_2_1" | "master": # create speclink only for v6.2.1+ spectra
+			img = f"{path}/v6_2_1/images/{daily}/v6_2_1/{group}/{field6}/{field6}-{mjd}/{spec(field6, obj)}"
+		case _:
+			img = f""
+
+	return url, img
 # speclink example:
-# https://data.sdss5.org/sas/sdsswork/bhm/boss/spectro/redux/v6_2_1/images/daily/v6_2_1/109XXX/109167/109167-60973/spec-image-109167-60973-63050395805349051.png 
+# https://data.sdss5.org/sas/sdsswork/bhm/boss/spectro/redux/v6_2_1/images/daily/v6_2_1/109XXX/109167/109167-60973/spec-image-109167-60973-63050395805349051.png
 
 def sdss_iau(α: float, δ: float) -> str:
 	def _str(x: float, tpl="00") -> str:

util/sdss_test.py

@@ -1,7 +1,8 @@
-from .sdss import sdss_iau
-from .sdss import sdss_sas_fits as func
+from .sdss import sdss_iau, sdss_sas_fits
 
 
+def func(*xs) -> str: return sdss_sas_fits(*xs)[0]
+
 def testset_dr19_026() -> None:
 	b = "26"
 	plate, mjd, fiber, fits = 266, 51602, 1, "spec-0266-51602-0001.fits"