RSHB/arm-scan-gateway
9
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Срез 0 [3.1] T6.1, T6.2: is_supported_major без int() — шаблон схемы ^1\.\d+$, тесты на длинную строку и "01.0"

Browse Source 
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Andrey Epifancev 2026-10-04 02:45:54 +04:00
parent 5821497713
commit 8c8237954e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/contract/common.py
View File

@ -36,7 +36,7 @@ RESULT_SCHEMA_VERSION_PATTERN = r"^\d+\.\d+$" # recognition-result-message.resu
T = TypeVar("T")
_VERSION_RE = re.compile(r"(\d+)\.\d+", re.ASCII)
_SUPPORTED_VERSION_RE = re.compile(SCHEMA_VERSION_PATTERN, re.ASCII) # ровно шаблон схемы, без int()
def is_supported_major(schema_version: object) -> bool:
@ -46,8 +46,8 @@ def is_supported_major(schema_version: object) -> bool:
"""
if not isinstance(schema_version, str):
return False
match = _VERSION_RE.fullmatch(schema_version)
return match is not None and int(match.group(1)) == SUPPORTED_MAJOR
# `$` Python допускает перевод строки в конце, `fullmatch` — нет; шаблон — тот же, что у схемы и модели
return _SUPPORTED_VERSION_RE.fullmatch(schema_version) is not None
class _NotNull:

4
api/tests/unit/test_contract.py
View File

@ -669,6 +669,8 @@ def test_integer_valued_float_is_normalized_to_int() -> None:
("2.0", False),
("0.9", False),
("10.0", False),
("01.0", False), # шаблон схемы `^1\\.\\d+$`: ведущий ноль в MAJOR недопустим
("9" * 5000 + ".0", False), # длиннее лимита int() (4300 цифр): без исключения
("11.0", False),
("1", False),
("1.", False),
@ -691,7 +693,7 @@ def test_supported_major_is_one() -> None:
assert SUPPORTED_MAJOR == 1
@pytest.mark.parametrize("version", ["1.0", "1.7", "2.0", "1", "1.0.1", "0.9"])
@pytest.mark.parametrize("version", ["1.0", "1.7", "2.0", "1", "1.0.1", "0.9", "01.0", "9" * 5000 + ".0"])
def test_is_supported_major_agrees_with_schema_pattern(version: str) -> None:
"""Проверка MAJOR совпадает с `schema_version` запроса по схеме (pattern `^1\\.\\d+$`)."""
payload = _example("request-image.json")