rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review of branch stitching-error-handling

Browse source 
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
This commit is contained in:
Joe Knapper 2026-02-13 18:48:15 +00:00
parent f6ae4807ff
commit 2b0af30019
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/openflexure_microscope_server/stitching.py
View file

@ -270,7 +270,7 @@ class FinalStitcher(BaseStitcher):
os.set_blocking(process.stdout.fileno(), False) os.set_blocking(process.stdout.fileno(), False)
output_lines = self._log_ongoing(process) output_lines = self._log_ongoing(process)
returncode = process.wait() returncode = process.wait()
full_output = "".join(output_lines) full_output = "\n".join(output_lines)
if returncode == 0: if returncode == 0:
self.logger.info("Stitching complete") self.logger.info("Stitching complete")
@ -284,17 +284,19 @@ class FinalStitcher(BaseStitcher):
elif returncode == 1: elif returncode == 1:
if "No space left on device" in full_output or "Errno 28" in full_output: if "No space left on device" in full_output or "Errno 28" in full_output:
raise ChildProcessError( raise ChildProcessError(
"Not enough space on disk to stitch. Please delete some scans or increase your storage size." "Not enough space on disk to stitch. Please delete some scans or increase "
"your storage size."
) )
if ( if (
"Maximum supported image dimension" in full_output "Maximum supported image dimension" in full_output
or "OSError: broken data stream when writing image file" in full_output or "OSError: broken data stream when writing image file" in full_output
): ):
raise ChildProcessError( raise ChildProcessError(
"Scan too big for stitching into a JPEG file. Download the full scan and stitch with alternate settings." Image dimensions too big for stitching into a JPEG file. Stitched output will exceed the maximum number of pixels in a JPEG (65,535×65,535 pixels). Download the full scan "
"and stitch with alternate settings."
) )
raise ChildProcessError( raise ChildProcessError(
"Stitching errored with exit code 1.\nCheck the logs for more information." "Unexpected error when stitching (Exit code 1).\nCheck the logs for more information."
) )
else: else:
raise ChildProcessError( raise ChildProcessError(
@ -333,10 +335,7 @@ class FinalStitcher(BaseStitcher):
"""Log everything currently available in the buffer and return lines.""" """Log everything currently available in the buffer and return lines."""
lines: list[str] = [] lines: list[str] = []
while True: while line := buffer.readline():
line = buffer.readline()
if not line:
break
clean = line.rstrip() clean = line.rstrip()
self.logger.info(clean) self.logger.info(clean)
lines.append(line) lines.append(line)