From 31f6ffab339c0937225169820e6c00f77d12cc71 Mon Sep 17 00:00:00 2001 From: cfs-data <145435153+cfs-data@users.noreply.github.com> Date: Wed, 26 Aug 2026 14:01:29 +0200 Subject: [PATCH 1/3] first commit --- scripts/csv_pairs.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/csv_pairs.py b/scripts/csv_pairs.py index 94603154..c5b72d23 100644 --- a/scripts/csv_pairs.py +++ b/scripts/csv_pairs.py @@ -33,8 +33,9 @@ #: Folder holding the per-mark-type result folders, inside the database folder. RESULTS_SUBDIR = Path("mark-comparison-results") -#: Keys in the API response. The metrics sit in a nested block -#: (``ComparisonImpressionMetrics`` / ``StriationComparisonResults``). +#: Keys in the API response. Most metrics sit in a nested block +#: (``ComparisonImpressionMetrics`` / ``StriationComparisonResults``); ``n_cells`` +#: is a computed field at the top level of ``ComparisonResponseImpression``. RESULTS_KEY = "comparison_results" MATCHING_CELLS_KEY = "score" TOTAL_CELLS_KEY = "n_cells" @@ -103,8 +104,9 @@ def extract_metrics(result: dict[str, Any] | None, mark_type: MarkType) -> dict[ return {} if isinstance(mark_type, MarkImpressionType): + # n_cells is a computed field on the response itself, not part of the nested metrics block. metrics = { - "total_cells": comparison_results.get(TOTAL_CELLS_KEY), + "total_cells": result.get(TOTAL_CELLS_KEY), "matching_cells": comparison_results.get(MATCHING_CELLS_KEY), } else: From 64f654af4f16a8bad9fca02cf85ecb47cabe145d Mon Sep 17 00:00:00 2001 From: cfs-data <145435153+cfs-data@users.noreply.github.com> Date: Wed, 26 Aug 2026 14:20:12 +0200 Subject: [PATCH 2/3] remove import module --- scripts/comparison_utils.py | 2 +- scripts/convert_scores.py | 8 ++++---- scripts/csv_pairs.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/comparison_utils.py b/scripts/comparison_utils.py index 28279705..2c53a912 100644 --- a/scripts/comparison_utils.py +++ b/scripts/comparison_utils.py @@ -10,7 +10,7 @@ from conversion.data_formats import MarkImpressionType, MarkStriationType, MarkType from conversion.surface_comparison.models import ComparisonParams -from scripts.conversion_utils import parse_db_scratch +from conversion_utils import parse_db_scratch logger = logging.getLogger(__name__) _MARK_TYPE_FOLDER_MAP: list[tuple[str, MarkType]] = sorted( diff --git a/scripts/convert_scores.py b/scripts/convert_scores.py index 249ba04b..8965aaa3 100644 --- a/scripts/convert_scores.py +++ b/scripts/convert_scores.py @@ -35,15 +35,15 @@ import requests from conversion.data_formats import MarkImpressionType -from scripts.comparison_utils import ( +from comparison_utils import ( ComparisonEntry, _build_body, _save_result, find_all_mark_types, generate_pairs, ) -from scripts.conversion_utils import ConversionConfig, run_parallel -from scripts.csv_pairs import ( +from conversion_utils import ConversionConfig, run_parallel +from csv_pairs import ( DONE_STATUSES, CsvTask, ScoreWriter, @@ -53,7 +53,7 @@ find_result_file, read_pairs_csv, ) -from scripts.http_utils import _cleanup_vault, _post_with_retry, download_urls +from http_utils import _cleanup_vault, _post_with_retry, download_urls logging.basicConfig(level=logging.WARNING, format="%(levelname)s: %(message)s") logger = logging.getLogger(__name__) diff --git a/scripts/csv_pairs.py b/scripts/csv_pairs.py index c5b72d23..27da6f18 100644 --- a/scripts/csv_pairs.py +++ b/scripts/csv_pairs.py @@ -25,8 +25,8 @@ from conversion.data_formats import MarkImpressionType, MarkType -from scripts.comparison_utils import ComparisonEntry, infer_mark_type -from scripts.conversion_utils import ConversionConfig +from comparison_utils import ComparisonEntry, infer_mark_type +from conversion_utils import ConversionConfig logger = logging.getLogger(__name__) From 18e1cb35425491feb840df41c4cd5908d839b115 Mon Sep 17 00:00:00 2001 From: cfs-data <145435153+cfs-data@users.noreply.github.com> Date: Wed, 26 Aug 2026 14:22:46 +0200 Subject: [PATCH 3/3] ruff --- scripts/comparison_utils.py | 1 - scripts/convert_scores.py | 3 +-- scripts/csv_pairs.py | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/comparison_utils.py b/scripts/comparison_utils.py index 2c53a912..ebd06c95 100644 --- a/scripts/comparison_utils.py +++ b/scripts/comparison_utils.py @@ -9,7 +9,6 @@ import numpy as np from conversion.data_formats import MarkImpressionType, MarkStriationType, MarkType from conversion.surface_comparison.models import ComparisonParams - from conversion_utils import parse_db_scratch logger = logging.getLogger(__name__) diff --git a/scripts/convert_scores.py b/scripts/convert_scores.py index 8965aaa3..d6469f12 100644 --- a/scripts/convert_scores.py +++ b/scripts/convert_scores.py @@ -33,8 +33,6 @@ from typing import Any import requests -from conversion.data_formats import MarkImpressionType - from comparison_utils import ( ComparisonEntry, _build_body, @@ -42,6 +40,7 @@ find_all_mark_types, generate_pairs, ) +from conversion.data_formats import MarkImpressionType from conversion_utils import ConversionConfig, run_parallel from csv_pairs import ( DONE_STATUSES, diff --git a/scripts/csv_pairs.py b/scripts/csv_pairs.py index 27da6f18..1605c3e3 100644 --- a/scripts/csv_pairs.py +++ b/scripts/csv_pairs.py @@ -23,9 +23,8 @@ from pathlib import Path from typing import Any -from conversion.data_formats import MarkImpressionType, MarkType - from comparison_utils import ComparisonEntry, infer_mark_type +from conversion.data_formats import MarkImpressionType, MarkType from conversion_utils import ConversionConfig logger = logging.getLogger(__name__)