9
9
from pydatalab .blocks .base import DataBlock
10
10
from pydatalab .bokeh_plots import DATALAB_BOKEH_THEME , selectable_axes_plot
11
11
from pydatalab .file_utils import get_file_info_by_id
12
- from pydatalab .logger import LOGGER
13
12
14
13
15
14
class UVVisBlock (DataBlock ):
@@ -80,7 +79,7 @@ def _format_UV_Vis_plot(
80
79
input list is empty or plotting is skipped internally.
81
80
"""
82
81
if not absorbance_data_list :
83
- LOGGER . warning ("Received an empty list of absorbance data. No plot generated." )
82
+ warnings . warn ("Received an empty list of absorbance data. No plot generated." )
84
83
return None
85
84
86
85
# Basic validation of input data structure
@@ -138,7 +137,7 @@ def _format_UV_Vis_plot(
138
137
def generate_absorbance_plot (self ):
139
138
absorbance_data = None
140
139
if "selected_file_order" not in self .data :
141
- LOGGER . warning ("No file set in the DataBlock - selected_file_order" )
140
+ warnings . warn ("No file set in the DataBlock - selected_file_order" )
142
141
return
143
142
144
143
else :
@@ -154,12 +153,6 @@ def generate_absorbance_plot(self):
154
153
ext = "" .join (Path (file ["location" ]).suffixes ).lower ()
155
154
# ext = os.path.splitext(file["location"].split("/")[-1])[-1].lower()
156
155
if ext not in {ext .lower () for ext in self .accepted_file_extensions }:
157
- LOGGER .warning (
158
- "Unsupported file extension (must be one of %s, not %s)" ,
159
- self .accepted_file_extensions ,
160
- ext ,
161
- )
162
-
163
156
raise ValueError (
164
157
f"Unsupported file extension (must be one of { self .accepted_file_extensions } , not { ext } )"
165
158
)
@@ -169,7 +162,7 @@ def generate_absorbance_plot(self):
169
162
for file in file_info [1 :]:
170
163
sample_data = self .parse_uvvis_txt (Path (file ["location" ]))
171
164
if sample_data is None or reference_data is None :
172
- LOGGER . warning ("Could not parse the UV-Vis data files" )
165
+ warnings . warn ("Could not parse the UV-Vis data files" )
173
166
return
174
167
# Calculate absorbance
175
168
absorbance_data .append (self .find_absorbance (sample_data , reference_data ))
0 commit comments