feat: ж/д слой + cant_swim в скоринг + профили вне модели
Определение специфических рекомендаций (матрица профилей §8):
1. Ж/д слой (закрыт мёртвый railway ×2.5 у РАС):
- /api/v1/water/{case_id} отдаёт railway=rail как LineString
(без service/industrial/military веток), кэш общий v2;
- railway_warning «перекрыть/проверить немедленно» по профилям;
- SearchMap: Polyline слой ж/д (тёмно-красный), счётчики 💧/🚂.
2. cant_swim → профиль не_умеет_плавать (water ×3.0, без изменения
радиуса, critical_warning «обследовать водоёмы НЕМЕДЛЕННО»):
- раньше чекбокс влиял только на текст, в скоринге был пробел;
- derive в analyze._derive_profiles — работает и для closed_cases.
3. unmodeled_profiles: ДЦП/слабое зрение/слух — честная пометка
«вне поведенческой модели» с пояснением (vector_tasks B12:
профили без аналога не выдавать за учтённые); блок на фронте
в карточке здоровья.
Площадь воды: сферический эксцесс, проверен на квадрате 53° (744017 м²
vs 743272 точного). Тесты: 202 passed (новый test_cant_swim_profile).
This commit is contained in:
@@ -0,0 +1,281 @@
|
||||
# This file is dual licensed under the terms of the Apache License, Version
|
||||
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
|
||||
# for complete details.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import abc
|
||||
import ipaddress
|
||||
import typing
|
||||
from email.utils import parseaddr
|
||||
|
||||
from cryptography.x509.name import Name
|
||||
from cryptography.x509.oid import ObjectIdentifier
|
||||
|
||||
_IPAddressTypes = typing.Union[
|
||||
ipaddress.IPv4Address,
|
||||
ipaddress.IPv6Address,
|
||||
ipaddress.IPv4Network,
|
||||
ipaddress.IPv6Network,
|
||||
]
|
||||
|
||||
|
||||
class UnsupportedGeneralNameType(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class GeneralName(metaclass=abc.ABCMeta):
|
||||
@property
|
||||
@abc.abstractmethod
|
||||
def value(self) -> typing.Any:
|
||||
"""
|
||||
Return the value of the object
|
||||
"""
|
||||
|
||||
|
||||
class RFC822Name(GeneralName):
|
||||
def __init__(self, value: str) -> None:
|
||||
if isinstance(value, str):
|
||||
try:
|
||||
value.encode("ascii")
|
||||
except UnicodeEncodeError:
|
||||
raise ValueError(
|
||||
"RFC822Name values should be passed as an A-label string. "
|
||||
"This means unicode characters should be encoded via "
|
||||
"a library like idna."
|
||||
)
|
||||
else:
|
||||
raise TypeError("value must be string")
|
||||
|
||||
name, address = parseaddr(value)
|
||||
if name or not address:
|
||||
# parseaddr has found a name (e.g. Name <email>) or the entire
|
||||
# value is an empty string.
|
||||
raise ValueError("Invalid rfc822name value")
|
||||
|
||||
self._value = value
|
||||
|
||||
@property
|
||||
def value(self) -> str:
|
||||
return self._value
|
||||
|
||||
@classmethod
|
||||
def _init_without_validation(cls, value: str) -> RFC822Name:
|
||||
instance = cls.__new__(cls)
|
||||
instance._value = value
|
||||
return instance
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<RFC822Name(value={self.value!r})>"
|
||||
|
||||
def __eq__(self, other: object) -> bool:
|
||||
if not isinstance(other, RFC822Name):
|
||||
return NotImplemented
|
||||
|
||||
return self.value == other.value
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.value)
|
||||
|
||||
|
||||
class DNSName(GeneralName):
|
||||
def __init__(self, value: str) -> None:
|
||||
if isinstance(value, str):
|
||||
try:
|
||||
value.encode("ascii")
|
||||
except UnicodeEncodeError:
|
||||
raise ValueError(
|
||||
"DNSName values should be passed as an A-label string. "
|
||||
"This means unicode characters should be encoded via "
|
||||
"a library like idna."
|
||||
)
|
||||
else:
|
||||
raise TypeError("value must be string")
|
||||
|
||||
self._value = value
|
||||
|
||||
@property
|
||||
def value(self) -> str:
|
||||
return self._value
|
||||
|
||||
@classmethod
|
||||
def _init_without_validation(cls, value: str) -> DNSName:
|
||||
instance = cls.__new__(cls)
|
||||
instance._value = value
|
||||
return instance
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<DNSName(value={self.value!r})>"
|
||||
|
||||
def __eq__(self, other: object) -> bool:
|
||||
if not isinstance(other, DNSName):
|
||||
return NotImplemented
|
||||
|
||||
return self.value == other.value
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.value)
|
||||
|
||||
|
||||
class UniformResourceIdentifier(GeneralName):
|
||||
def __init__(self, value: str) -> None:
|
||||
if isinstance(value, str):
|
||||
try:
|
||||
value.encode("ascii")
|
||||
except UnicodeEncodeError:
|
||||
raise ValueError(
|
||||
"URI values should be passed as an A-label string. "
|
||||
"This means unicode characters should be encoded via "
|
||||
"a library like idna."
|
||||
)
|
||||
else:
|
||||
raise TypeError("value must be string")
|
||||
|
||||
self._value = value
|
||||
|
||||
@property
|
||||
def value(self) -> str:
|
||||
return self._value
|
||||
|
||||
@classmethod
|
||||
def _init_without_validation(cls, value: str) -> UniformResourceIdentifier:
|
||||
instance = cls.__new__(cls)
|
||||
instance._value = value
|
||||
return instance
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<UniformResourceIdentifier(value={self.value!r})>"
|
||||
|
||||
def __eq__(self, other: object) -> bool:
|
||||
if not isinstance(other, UniformResourceIdentifier):
|
||||
return NotImplemented
|
||||
|
||||
return self.value == other.value
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.value)
|
||||
|
||||
|
||||
class DirectoryName(GeneralName):
|
||||
def __init__(self, value: Name) -> None:
|
||||
if not isinstance(value, Name):
|
||||
raise TypeError("value must be a Name")
|
||||
|
||||
self._value = value
|
||||
|
||||
@property
|
||||
def value(self) -> Name:
|
||||
return self._value
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<DirectoryName(value={self.value})>"
|
||||
|
||||
def __eq__(self, other: object) -> bool:
|
||||
if not isinstance(other, DirectoryName):
|
||||
return NotImplemented
|
||||
|
||||
return self.value == other.value
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.value)
|
||||
|
||||
|
||||
class RegisteredID(GeneralName):
|
||||
def __init__(self, value: ObjectIdentifier) -> None:
|
||||
if not isinstance(value, ObjectIdentifier):
|
||||
raise TypeError("value must be an ObjectIdentifier")
|
||||
|
||||
self._value = value
|
||||
|
||||
@property
|
||||
def value(self) -> ObjectIdentifier:
|
||||
return self._value
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<RegisteredID(value={self.value})>"
|
||||
|
||||
def __eq__(self, other: object) -> bool:
|
||||
if not isinstance(other, RegisteredID):
|
||||
return NotImplemented
|
||||
|
||||
return self.value == other.value
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.value)
|
||||
|
||||
|
||||
class IPAddress(GeneralName):
|
||||
def __init__(self, value: _IPAddressTypes) -> None:
|
||||
if not isinstance(
|
||||
value,
|
||||
(
|
||||
ipaddress.IPv4Address,
|
||||
ipaddress.IPv6Address,
|
||||
ipaddress.IPv4Network,
|
||||
ipaddress.IPv6Network,
|
||||
),
|
||||
):
|
||||
raise TypeError(
|
||||
"value must be an instance of ipaddress.IPv4Address, "
|
||||
"ipaddress.IPv6Address, ipaddress.IPv4Network, or "
|
||||
"ipaddress.IPv6Network"
|
||||
)
|
||||
|
||||
self._value = value
|
||||
|
||||
@property
|
||||
def value(self) -> _IPAddressTypes:
|
||||
return self._value
|
||||
|
||||
def _packed(self) -> bytes:
|
||||
if isinstance(
|
||||
self.value, (ipaddress.IPv4Address, ipaddress.IPv6Address)
|
||||
):
|
||||
return self.value.packed
|
||||
else:
|
||||
return (
|
||||
self.value.network_address.packed + self.value.netmask.packed
|
||||
)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<IPAddress(value={self.value})>"
|
||||
|
||||
def __eq__(self, other: object) -> bool:
|
||||
if not isinstance(other, IPAddress):
|
||||
return NotImplemented
|
||||
|
||||
return self.value == other.value
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.value)
|
||||
|
||||
|
||||
class OtherName(GeneralName):
|
||||
def __init__(self, type_id: ObjectIdentifier, value: bytes) -> None:
|
||||
if not isinstance(type_id, ObjectIdentifier):
|
||||
raise TypeError("type_id must be an ObjectIdentifier")
|
||||
if not isinstance(value, bytes):
|
||||
raise TypeError("value must be a binary string")
|
||||
|
||||
self._type_id = type_id
|
||||
self._value = value
|
||||
|
||||
@property
|
||||
def type_id(self) -> ObjectIdentifier:
|
||||
return self._type_id
|
||||
|
||||
@property
|
||||
def value(self) -> bytes:
|
||||
return self._value
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<OtherName(type_id={self.type_id}, value={self.value!r})>"
|
||||
|
||||
def __eq__(self, other: object) -> bool:
|
||||
if not isinstance(other, OtherName):
|
||||
return NotImplemented
|
||||
|
||||
return self.type_id == other.type_id and self.value == other.value
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash((self.type_id, self.value))
|
||||
Reference in New Issue
Block a user