Формы через arm_statements, контракт результата v2.0 (#54) #55

Merged
aep merged 15 commits from feat/54-statements-v2 into main 2026-10-19 07:38:07 +03:00
2 changed files with 4 additions and 3 deletions
Showing only changes of commit b583b0472f - Show all commits

View File

@ -21,8 +21,9 @@ def _candidates(path: Path): # noqa: ANN202
sheets, _ = read_book(path.read_bytes(), path.suffix.lstrip(".").upper()) # type: ignore[arg-type]
osv_rules = load_rules()
rules = default_rules()
plan = plan_sheets(sheets, lambda sheet: is_osv_sheet(sheet, osv_rules), rules)
return build_candidates(plan.statements, rules, Deadline(600.0), xlsb=False)
deadline = Deadline(600.0)
plan = plan_sheets(sheets, lambda sheet: is_osv_sheet(sheet, osv_rules), rules, deadline)
return build_candidates(plan.statements, rules, deadline, xlsb=False)
def test_npz_candidates(fixtures_dir: Path) -> None:

View File

@ -18,6 +18,7 @@ from jsonschema import Draft202012Validator, FormatChecker
from loguru import logger
from referencing import Registry, Resource
from arm_statements import RulesError
from src.contract import (
NATS_MSG_ID_HEADER,
RESULT_SUBJECT,
@ -35,7 +36,6 @@ from src.contract import (
from src.core.config import NATSSettings
from src.core.nats import NatsConnection, NatsPublishError
from src.core.worker import RecognitionWorker, result_key
from arm_statements import RulesError
from src.parser import NullParser, ParseOutcome, get_parser, require_statements_version
API_DIR = Path(__file__).resolve().parents[2]