From 883c6fb628619317a431ccd55505bae56db3ce10 Mon Sep 17 00:00:00 2001 From: Andrey Epifancev Date: Mon, 19 Oct 2026 11:53:24 +0400 Subject: [PATCH] =?UTF-8?q?fix(osv):=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B2=D0=B8=D0=B4=D0=B0=20=D1=81=D1=83=D0=B1=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D0=BE=20=D0=BD=D0=B5=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BC=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=88=D0=B0=D0=BF=D0=BA=D0=B8=20=D0=B8=20ACCOUNT=20?= =?UTF-8?q?=D0=B2=20=D1=81=D1=85=D0=B5=D0=BC=D1=83=20(#59)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 5.5 --- api/src/parser/header.py | 11 ++++++++--- api/tests/unit/parser/test_header.py | 8 ++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/api/src/parser/header.py b/api/src/parser/header.py index 58ca007..4512e3a 100644 --- a/api/src/parser/header.py +++ b/api/src/parser/header.py @@ -581,12 +581,17 @@ def _variant1_groups(sheet: Sheet, header: TableHeader, rules: Rules) -> GroupSc def _kind_row_groups(sheet: Sheet, header: TableHeader, rules: Rules) -> list[OsvGroup]: - """Виды субконто из строки шапки между названием и периодом: только узнанные явной записью словаря групп.""" + """Виды субконто из строки шапки между названием и периодом: только узнанные явной записью словаря групп, не + ACCOUNT; метки шапки (в том числе валюта) видом субконто не считаются.""" + cells = _head_cells(sheet, header) + currency = _currency_cells(cells, rules) groups: list[OsvGroup] = [] - for cell in _kind_row_cells(_head_cells(sheet, header), rules): + for cell in _kind_row_cells(cells, rules): + if cell in currency or _is_structural_marker(cell, rules): + continue for item in (part.strip() for part in cell.text.split(_LIST_SEPARATOR)): known = rules.groups.known(item) if item else None - if known is not None: + if known is not None and known != "ACCOUNT": groups.append(_group(known, item)) return groups diff --git a/api/tests/unit/parser/test_header.py b/api/tests/unit/parser/test_header.py index c2776ce..e0079fc 100644 --- a/api/tests/unit/parser/test_header.py +++ b/api/tests/unit/parser/test_header.py @@ -643,3 +643,11 @@ def test_unknown_kind_row_is_not_added_to_schema(rules: Rules) -> None: def test_organizations_kind_row_is_counterparty(rules: Rules) -> None: assert _flat_schema(rules, "Организации") == [("ACCOUNT", "Субконто"), ("COUNTERPARTY", "Организации")] + + +def test_currency_row_between_title_and_period_is_not_added_to_schema(rules: Rules) -> None: + assert _flat_schema(rules, "Валюта БУ, НУ: RUB") == [("ACCOUNT", "Субконто")] + + +def test_subkonto_cell_between_title_and_period_does_not_add_second_account(rules: Rules) -> None: + assert _flat_schema(rules, "Субконто") == [("ACCOUNT", "Субконто")]