From 84b216c2a6f459fd7008b2eb8abdaf98851a6b04 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 19 Jan 2025 18:41:58 +0300 Subject: [PATCH] nixos/test-driver: fix OCR I don't know why it doesn't want to do TIFF now, but there's also absolutely no reason for it to be TIFF anyway, so let's just use an image format that is actually sane. --- nixos/lib/test-driver/src/test_driver/machine.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/lib/test-driver/src/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py index b554f73167794..7e335f7f1c56f 100644 --- a/nixos/lib/test-driver/src/test_driver/machine.py +++ b/nixos/lib/test-driver/src/test_driver/machine.py @@ -105,14 +105,16 @@ def _perform_ocr_on_screenshot( tess_args = "-c debug_file=/dev/null --psm 11" - cmd = f"convert {magick_args} '{screenshot_path}' 'tiff:{screenshot_path}.tiff'" + cmd = f"magick convert {magick_args} '{screenshot_path}' '{screenshot_path}.png'" ret = subprocess.run(cmd, shell=True, capture_output=True) if ret.returncode != 0: - raise Exception(f"TIFF conversion failed with exit code {ret.returncode}") + raise Exception( + f"Image processing failed with exit code {ret.returncode}, stdout: {ret.stdout.decode()}, stderr: {ret.stderr.decode()}" + ) model_results = [] for model_id in model_ids: - cmd = f"tesseract '{screenshot_path}.tiff' - {tess_args} --oem '{model_id}'" + cmd = f"tesseract '{screenshot_path}.png' - {tess_args} --oem '{model_id}'" ret = subprocess.run(cmd, shell=True, capture_output=True) if ret.returncode != 0: raise Exception(f"OCR failed with exit code {ret.returncode}")