followthemoney 4.3.0__py3-none-any.whl → 4.3.4__py3-none-any.whl

followthemoney/__init__.py

@@ -9,7 +9,7 @@ from followthemoney.statement import Statement, StatementEntity, SE
 from followthemoney.dataset import Dataset, DefaultDataset, DS
 from followthemoney.util import set_model_locale
 
-__version__ = "4.3.0"
+__version__ = "4.3.4"
 
 # Data model singleton
 model = Model.instance()

followthemoney/compare.py

@@ -71,12 +71,31 @@ def _compare(scores: Scores, weights: Weights, n_std: int = 1) -> float:
     return 1.0 / (1.0 + math.exp(-prob))
 
 
+def entity_is_same(left: EntityProxy, right: EntityProxy) -> bool:
+    """Check if two entities are the same apart from their ID."""
+    if left.schema != right.schema:
+        return False
+
+    props = set(left.properties.keys()).union(right.properties.keys())
+    if 0 == len(props):
+        return False
+
+    for prop in props:
+        left_vals = sorted(left.get(prop))
+        right_vals = sorted(right.get(prop))
+        if left_vals != right_vals:
+            return False
+    return True
+
+
 def compare(
     left: EntityProxy,
     right: EntityProxy,
     weights: Weights = COMPARE_WEIGHTS,
 ) -> float:
     """Compare two entities and return a match score."""
+    if entity_is_same(left, right):
+        return 1.0
     scores = compare_scores(left, right)
     return _compare(scores, weights)
 

followthemoney/entity.py

@@ -42,25 +42,28 @@ class ValueEntity(EntityProxy):
         key_prefix: Optional[str] = None,
         cleaned: bool = True,
     ):
+        self._caption: Optional[str] = data.pop("caption", None)
+        self.datasets: Set[str] = set(data.pop("datasets", []))
+        self.referents: Set[str] = set(data.pop("referents", []))
+        self.first_seen: Optional[str] = data.pop("first_seen", None)
+        self.last_seen: Optional[str] = data.pop("last_seen", None)
+        self.last_change: Optional[str] = data.pop("last_change", None)
         super().__init__(schema, data, key_prefix=key_prefix, cleaned=cleaned)
-        self._caption: Optional[str] = data.get("caption")
-        self.datasets: Set[str] = set(data.get("datasets", []))
-        self.referents: Set[str] = set(data.get("referents", []))
-        self.first_seen: Optional[str] = data.get("first_seen")
-        self.last_seen: Optional[str] = data.get("last_seen")
-        self.last_change: Optional[str] = data.get("last_change")
 
         # add data from statement dict if present.
         # this updates the dataset and referents set
         for stmt_data in data.pop("statements", []):
             stmt = Statement.from_dict(stmt_data)
+            prop = schema.get(stmt.prop)
+            if prop is None:
+                continue
             self.datasets.add(stmt.dataset)
             if stmt.schema != self.schema.name:
                 self.schema = schema.model.common_schema(self.schema, stmt.schema)
             if stmt.entity_id != self.id:
                 self.referents.add(stmt.entity_id)
             if stmt.prop != BASE_ID:
-                self.add(stmt.prop, stmt.value)
+                self.unsafe_add(prop, stmt.value, cleaned=cleaned)
 
     def merge(self: VE, other: EntityProxy) -> VE:
         merged = super().merge(other)
@@ -79,14 +82,11 @@ class ValueEntity(EntityProxy):
         return merged
 
     def to_dict(self) -> Dict[str, Any]:
-        data: Dict[str, Any] = {
-            "id": self.id,
-            "caption": self._caption or self.caption,
-            "schema": self.schema.name,
-            "properties": self.properties,
-            "referents": list(self.referents),
-            "datasets": list(self.datasets),
-        }
+        data = super().to_dict()
+        data["referents"] = list(self.referents)
+        data["datasets"] = list(self.datasets)
+        if self._caption is not None:
+            data["caption"] = self._caption
         if self.first_seen is not None:
             data["first_seen"] = self.first_seen
         if self.last_seen is not None:

followthemoney/model.py

@@ -9,6 +9,7 @@ from followthemoney.types.common import PropertyType, PropertyTypeToDict
 from followthemoney.schema import Schema, SchemaToDict
 from followthemoney.property import Property
 from followthemoney.exc import InvalidModel, InvalidData
+from followthemoney.util import const
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -72,6 +73,7 @@ class Model(object):
             if not isinstance(data, dict):
                 raise InvalidModel("Model file is not a mapping: %s" % filepath)
             for name, config in data.items():
+                name = const(name)
                 self.schemata[name] = Schema(self, name, config)
 
     def get(self, name: Union[str, Schema]) -> Optional[Schema]:

followthemoney/property.py

@@ -1,8 +1,9 @@
 import re
 from banal import is_mapping, as_bool
+from rigour.ids import get_identifier_format
 from typing import TYPE_CHECKING, Any, List, Optional, TypedDict
 
-from followthemoney.exc import InvalidModel
+from followthemoney.exc import InvalidData, InvalidModel
 from followthemoney.types import registry
 from followthemoney.util import gettext, get_entity_id, const
 
@@ -86,17 +87,16 @@ class Property:
         self.schema = schema
 
         #: Machine-readable name for this property.
-        self.name = const(name)
+        self.name = name
         if not check_property_name(self.name):
             raise InvalidModel("Invalid name: %s" % self.name)
 
         #: Qualified property name, which also includes the schema name.
         self.qname = const("%s:%s" % (schema.name, self.name))
 
-        self._hash = hash("<Property(%r)>" % self.qname)
-
         self._label = data.get("label", name)
         self._description = data.get("description")
+        self._hash = hash("<Property(%r)>" % self.qname)
 
         #: This property is deprecated and should not be used.
         self.deprecated = as_bool(data.get("deprecated", False))
@@ -157,6 +157,13 @@ class Property:
                     raise InvalidModel("Invalid reverse: %s" % self)
                 self.reverse = self.range._add_reverse(model, self._reverse, self)
 
+        if self.type == registry.identifier and self.format is not None:
+            format_ = get_identifier_format(self.format)
+            if format_ is None or format_.NAME != self.format:
+                raise InvalidModel("Invalid identifier format: %s" % self.format)
+            # Internalize the string:
+            self.format = format_.NAME
+
     @property
     def label(self) -> str:
         """User-facing title for this property."""
@@ -229,6 +236,18 @@ class Property:
             data["format"] = self.format
         return data
 
+    def __reduce__(self) -> Any:
+        return (self._reconstruct, (self.qname,))
+
+    @classmethod
+    def _reconstruct(cls, qname: str) -> "Property":
+        from followthemoney.model import Model
+
+        prop = Model.instance().get_qname(qname)
+        if prop is None:
+            raise InvalidData("Unknown property: %r" % qname)
+        return prop
+
     def __repr__(self) -> str:
         return "<Property(%r)>" % self.qname
 

followthemoney/proxy.py

@@ -403,13 +403,10 @@ class EntityProxy(object):
         schema and any contextual values that were handed in initially. The resulting
         dictionary can be used to make a new proxy, and it is commonly written to disk
         or a database."""
-        data = dict(self.context)
-        extra = {
-            "id": self.id,
-            "schema": self.schema.name,
-            "properties": self.properties,
-        }
-        data.update(extra)
+        data: Dict[str, Any] = dict(self.context)
+        data["id"] = self.id
+        data["schema"] = self.schema.name
+        data["properties"] = self.properties
         return data
 
     def to_full_dict(self, matchable: bool = False) -> Dict[str, Any]:
@@ -462,7 +459,7 @@ class EntityProxy(object):
         return self._size
 
     def __hash__(self) -> int:
-        if not self.id:
+        if self.id is None:
             raise RuntimeError("Cannot hash entity without an ID")
         return hash(self.id)
 

followthemoney/schema/Company.yaml

@@ -18,6 +18,10 @@ Company:
     - name
   caption:
     - name
+    - alias
+    - weakAlias
+    - previousName
+    - registrationNumber
   properties:
     jurisdiction:
       label: Jurisdiction

followthemoney/schema/LegalEntity.yaml

@@ -17,6 +17,9 @@ LegalEntity:
     - name
   caption:
     - name
+    - alias
+    - weakAlias
+    - previousName
     - email
     - phone
     - registrationNumber

followthemoney/schema/Organization.yaml

@@ -17,6 +17,10 @@ Organization:
     - name
   caption:
     - name
+    - alias
+    - weakAlias
+    - previousName
+    - registrationNumber
   properties:
     cageCode:
       label: CAGE

followthemoney/schema/Person.yaml

@@ -14,6 +14,9 @@ Person:
     - name
   caption:
     - name
+    - alias
+    - weakAlias
+    - previousName
     - lastName
     - email
     - phone

followthemoney/schema/PublicBody.yaml

@@ -13,5 +13,8 @@ PublicBody:
     - status
   caption:
     - name
+    - alias
+    - weakAlias
+    - previousName
   required:
     - name

followthemoney/schema/Thing.yaml

@@ -24,7 +24,7 @@ Thing:
       label: Country
       type: country
     alias:
-      label: Other name
+      label: Alias
       type: name
     previousName:
       label: Previous name
@@ -32,6 +32,7 @@ Thing:
     weakAlias:
       label: Weak alias
       type: name
+      description: "A relatively broad or generic alias that should not be used for matching in screening systems. It may still may be useful for identification purposes, particularly in confirming a possible match triggered by other identifier information."
       matchable: false
     sourceUrl:
       label: Source link
@@ -55,7 +56,7 @@ Thing:
     wikidataId:
       label: Wikidata ID
       type: identifier
-      format: qid
+      format: wikidata
       maxLength: 32
     keywords:
       label: Keywords

followthemoney/schema.py

@@ -106,7 +106,7 @@ class Schema:
 
     def __init__(self, model: "Model", name: str, data: SchemaSpec) -> None:
         #: Machine-readable name of the schema, used for identification.
-        self.name = const(name)
+        self.name = name
         self.model = model
         self._label = data.get("label", name)
         self._plural = data.get("plural", self.label)
@@ -191,6 +191,7 @@ class Schema:
         #: inherited from parent schemata.
         self.properties: Dict[str, Property] = {}
         for pname, prop in data.get("properties", {}).items():
+            pname = const(pname)
             self.properties[pname] = Property(self, pname, prop)
 
     def generate(self, model: "Model") -> None:
@@ -264,6 +265,7 @@ class Schema:
         name = data.get("name")
         if name is None:
             raise InvalidModel("Unnamed reverse: %s" % other)
+        name = const(name)
 
         prop = self.get(name)
         if prop is None:
@@ -272,7 +274,7 @@ class Schema:
                 "type": registry.entity.name,
                 "reverse": {"name": other.name},
                 "range": other.schema.name,
-                "hidden": data.get("hidden", other.hidden),
+                "hidden": as_bool(data.get("hidden", other.hidden)),
             }
             prop = Property(self, name, spec)
             prop.stub = True
@@ -466,6 +468,18 @@ class Schema:
         data["properties"] = properties
         return data
 
+    def __reduce__(self) -> Any:
+        return (self._reconstruct, (self.name,))
+
+    @classmethod
+    def _reconstruct(cls, name: str) -> "Schema":
+        from followthemoney.model import Model
+
+        schema = Model.instance().get(name)
+        if schema is None:
+            raise InvalidData("Unknown schema: %r" % name)
+        return schema
+
     def __eq__(self, other: Any) -> bool:
         """Compare two schemata (via hash)."""
         try:

followthemoney/statement/util.py

@@ -1,8 +1,8 @@
-import sys
 from functools import cache
 from typing import Tuple
 
 from followthemoney.model import Model
+from followthemoney.util import const
 
 BASE_ID = "id"
 
@@ -28,4 +28,4 @@ def get_prop_type(schema: str, prop: str) -> str:
 def unpack_prop(id: str) -> Tuple[str, str, str]:
     schema, prop = id.split(":", 1)
     prop_type = get_prop_type(schema, prop)
-    return sys.intern(schema), prop_type, sys.intern(prop)
+    return const(schema), prop_type, const(prop)

followthemoney/types/address.py

@@ -6,7 +6,7 @@ from rigour.text.distance import levenshtein_similarity
 
 from followthemoney.types.common import PropertyType
 from followthemoney.util import defer as _
-from followthemoney.util import dampen, const
+from followthemoney.util import dampen
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -20,8 +20,8 @@ class AddressType(PropertyType):
 
     LINE_BREAKS = re.compile(r"(\r\n|\n|<BR/>|<BR>|\t|ESQ\.,|ESQ,|;)")
     COMMATA = re.compile(r"(,\s?[,\.])")
-    name = const("address")
-    group = const("addresses")
+    name = "address"
+    group = "addresses"
     label = _("Address")
     plural = _("Addresses")
     matchable = True

followthemoney/types/checksum.py

@@ -1,5 +1,5 @@
 from followthemoney.types.common import PropertyType
-from followthemoney.util import const, defer as _
+from followthemoney.util import defer as _
 
 
 class ChecksumType(PropertyType):
@@ -12,8 +12,8 @@ class ChecksumType(PropertyType):
     of this type are scrubbed when submitted via the normal API. Checksums can only
     be defined by uploading a document to be ingested."""
 
-    name = const("checksum")
-    group = const("checksums")
+    name = "checksum"
+    group = "checksums"
     label = _("Checksum")
     plural = _("Checksums")
     matchable = True

followthemoney/types/country.py

@@ -3,7 +3,7 @@ from babel.core import Locale
 from rigour.territories import get_ftm_countries, lookup_territory
 
 from followthemoney.types.common import EnumType, EnumValues
-from followthemoney.util import const, defer as _
+from followthemoney.util import defer as _
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -15,8 +15,8 @@ class CountryType(EnumType):
     a number of unusual and controversial designations (e.g. the Soviet Union,
     Transnistria, Somaliland, Kosovo)."""
 
-    name = const("country")
-    group = const("countries")
+    name = "country"
+    group = "countries"
     label = _("Country")
     plural = _("Countries")
     matchable = True

followthemoney/types/date.py

@@ -5,7 +5,7 @@ from prefixdate import parse, parse_format, Precision
 
 from followthemoney.types.common import PropertyType
 from followthemoney.util import defer as _
-from followthemoney.util import dampen, const
+from followthemoney.util import dampen
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -20,8 +20,8 @@ class DateType(PropertyType):
     The timezone is always expected to be UTC and cannot be specified otherwise. There is
     no support for calendar weeks (`2021-W7`) and date ranges (`2021-2024`)."""
 
-    name = const("date")
-    group = const("dates")
+    name = "date"
+    group = "dates"
     label = _("Date")
     plural = _("Dates")
     matchable = True

followthemoney/types/entity.py

@@ -4,7 +4,7 @@ from typing import Any, Optional, TYPE_CHECKING
 from followthemoney.types.common import PropertyType
 from followthemoney.value import Value
 from followthemoney.util import ENTITY_ID_LEN, get_entity_id, sanitize_text
-from followthemoney.util import const, gettext, defer as _
+from followthemoney.util import gettext, defer as _
 from followthemoney.exc import InvalidData
 
 if TYPE_CHECKING:
@@ -22,8 +22,8 @@ class EntityType(PropertyType):
 
     REGEX_RAW = r"^[0-9a-zA-Z]([0-9a-zA-Z\.\-]*[0-9a-zA-Z])?$"
     REGEX = re.compile(REGEX_RAW)
-    name = const("entity")
-    group = const("entities")
+    name = "entity"
+    group = "entities"
     label = _("Entity")
     plural = _("Entities")
     matchable = True

followthemoney/types/gender.py

@@ -2,7 +2,7 @@ from typing import Optional, TYPE_CHECKING
 from babel.core import Locale
 
 from followthemoney.types.common import EnumType, EnumValues
-from followthemoney.util import const, gettext, defer as _
+from followthemoney.util import gettext, defer as _
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -14,9 +14,9 @@ class GenderType(EnumType):
     government databases and represent it in a way that can be used by
     structured tools. I'm not sure this justifies the simplification."""
 
-    MALE = const("male")
-    FEMALE = const("female")
-    OTHER = const("other")
+    MALE = "male"
+    FEMALE = "female"
+    OTHER = "other"
 
     LOOKUP = {
         "m": MALE,
@@ -34,8 +34,8 @@ class GenderType(EnumType):
         "divers": OTHER,
     }
 
-    name = const("gender")
-    group = const("genders")
+    name = "gender"
+    group = "genders"
     label = _("Gender")
     plural = _("Genders")
     matchable = False

followthemoney/types/identifier.py

@@ -1,10 +1,10 @@
 import re
 from typing import Optional, TYPE_CHECKING
-from rigour.ids import get_identifier_format_names, get_identifier_format
+from rigour.ids import get_identifier_format
 
 from followthemoney.types.common import PropertyType
 from followthemoney.util import dampen, shortest, longest
-from followthemoney.util import const, defer as _
+from followthemoney.util import defer as _
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -20,8 +20,8 @@ class IdentifierType(PropertyType):
     Four- or five-digit industry classifiers create more noise than value."""
 
     COMPARE_CLEAN = re.compile(r"[\W_]+")
-    name = const("identifier")
-    group = const("identifiers")
+    name = "identifier"
+    group = "identifiers"
     label = _("Identifier")
     plural = _("Identifiers")
     matchable = True
@@ -35,8 +35,8 @@ class IdentifierType(PropertyType):
         format: Optional[str] = None,
         proxy: Optional["EntityProxy"] = None,
     ) -> Optional[str]:
-        if format in get_identifier_format_names():
-            format_ = get_identifier_format(format)
+        format_ = get_identifier_format(format)
+        if format_ is not None:
             return format_.normalize(text)
         return text
 
@@ -61,7 +61,7 @@ class IdentifierType(PropertyType):
         return f"id:{value}"
 
     def caption(self, value: str, format: Optional[str] = None) -> str:
-        if format in get_identifier_format_names():
-            format_ = get_identifier_format(format)
+        format_ = get_identifier_format(format)
+        if format_ is not None:
             return format_.format(value)
         return value

followthemoney/types/ip.py

@@ -2,7 +2,7 @@ from typing import Optional, TYPE_CHECKING
 from ipaddress import ip_address
 
 from followthemoney.types.common import PropertyType
-from followthemoney.util import const, defer as _
+from followthemoney.util import defer as _
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -13,8 +13,8 @@ class IpType(PropertyType):
     by the protocol versions 4 (e.g. `192.168.1.143`) and 6
     (e.g. `0:0:0:0:0:ffff:c0a8:18f`)."""
 
-    name = const("ip")
-    group = const("ips")
+    name = "ip"
+    group = "ips"
     label = _("IP Address")
     plural = _("IP Addresses")
     matchable = True

followthemoney/types/json.py

@@ -3,7 +3,7 @@ from typing import Any, Optional, Sequence, TYPE_CHECKING
 from banal import ensure_list
 
 from followthemoney.types.common import PropertyType
-from followthemoney.util import const, sanitize_text, defer as _
+from followthemoney.util import sanitize_text, defer as _
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -14,7 +14,7 @@ class JsonType(PropertyType):
     and some other edge cases. It's a really bad idea and we should try to get rid
     of JSON properties."""
 
-    name = const("json")
+    name = "json"
     group = None
     label = _("Nested data")
     plural = _("Nested data")

followthemoney/types/language.py

@@ -4,7 +4,7 @@ from rigour.langs import iso_639_alpha3
 
 from followthemoney.types.common import EnumType, EnumValues
 from followthemoney.util import defer as _, gettext
-from followthemoney.util import const, get_env_list
+from followthemoney.util import get_env_list
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -16,8 +16,8 @@ class LanguageType(EnumType):
     for additional languages once there is a specific need for them to be
     supported."""
 
-    name = const("language")
-    group = const("languages")
+    name = "language"
+    group = "languages"
     label = _("Language")
     plural = _("Languages")
     matchable = False

followthemoney/types/mimetype.py

@@ -3,7 +3,7 @@ from rigour.mime import normalize_mimetype, parse_mimetype
 from rigour.mime import DEFAULT
 
 from followthemoney.types.common import PropertyType
-from followthemoney.util import const, defer as _
+from followthemoney.util import defer as _
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -18,8 +18,8 @@ class MimeType(PropertyType):
     MIME type properties do not contain parameters as used in HTTP headers,
     like `charset=UTF-8`."""
 
-    name = const("mimetype")
-    group = const("mimetypes")
+    name = "mimetype"
+    group = "mimetypes"
     label = _("MIME-Type")
     plural = _("MIME-Types")
     matchable = False

followthemoney/types/name.py

@@ -7,7 +7,7 @@ from rigour.text.distance import levenshtein_similarity
 
 from followthemoney.types.common import PropertyType
 from followthemoney.util import dampen
-from followthemoney.util import const, defer as _
+from followthemoney.util import defer as _
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -21,8 +21,8 @@ class NameType(PropertyType):
     No validation rules apply, and things having multiple names must be considered
     a perfectly ordinary case."""
 
-    name = const("name")
-    group = const("names")
+    name = "name"
+    group = "names"
     label = _("Name")
     plural = _("Names")
     matchable = True

followthemoney/types/number.py

@@ -2,7 +2,7 @@ import re
 from typing import Optional, Tuple
 
 from followthemoney.types.common import PropertyType
-from followthemoney.util import const, defer as _
+from followthemoney.util import defer as _
 
 
 class NumberType(PropertyType):
@@ -24,7 +24,7 @@ class NumberType(PropertyType):
     _FLOAT_FMT = "{:" + SEPARATOR + "." + str(PRECISION) + "f}"
     _INT_FMT = "{:" + SEPARATOR + "d}"
 
-    name = const("number")
+    name = "number"
     label = _("Number")
     plural = _("Numbers")
     matchable = False

followthemoney/types/phone.py

@@ -6,7 +6,7 @@ from phonenumbers.phonenumberutil import region_code_for_number, NumberParseExce
 
 from followthemoney.types.common import PropertyType
 from followthemoney.util import defer as _
-from followthemoney.util import const, dampen
+from followthemoney.util import dampen
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -29,8 +29,8 @@ class PhoneType(PropertyType):
     validation outcome from doing the two operations the other way around. Always
     define the country first."""
 
-    name = const("phone")
-    group = const("phones")
+    name = "phone"
+    group = "phones"
     label = _("Phone number")
     plural = _("Phone numbers")
     matchable = True

followthemoney/types/string.py

@@ -6,7 +6,7 @@ from followthemoney.util import MEGABYTE
 class StringType(PropertyType):
     """A simple string property with no additional semantics."""
 
-    name = const("string")
+    name = "string"
     label = _("Label")
     plural = _("Labels")
     matchable = False
@@ -21,7 +21,7 @@ class TextType(StringType):
     string properties, it might make sense to treat properties of this type as
     full-text search material."""
 
-    name = const("text")
+    name = "text"
     label = _("Text")
     plural = _("Texts")
     total_size = 30 * MEGABYTE

followthemoney/types/topic.py

@@ -1,7 +1,7 @@
 from babel.core import Locale
 
 from followthemoney.types.common import EnumType, EnumValues
-from followthemoney.util import const, gettext, defer as _
+from followthemoney.util import gettext, defer as _
 
 
 class TopicType(EnumType):
@@ -15,8 +15,8 @@ class TopicType(EnumType):
     enable queries such as _find all paths between a government procurement
     award and a politician_."""
 
-    name = const("topic")
-    group = const("topics")
+    name = "topic"
+    group = "topics"
     label = _("Topic")
     plural = _("Topics")
     matchable = False
@@ -86,6 +86,8 @@ class TopicType(EnumType):
         "sanction.linked": _("Sanction-linked entity"),
         "sanction.counter": _("Counter-sanctioned entity"),
         "export.control": _("Export controlled"),
+        # For BIS 50% rule:
+        "export.control.linked": _("Export control-linked"),
         "export.risk": _("Trade risk"),
         "debarment": _("Debarred entity"),
         "poi": _("Person of interest"),
@@ -103,6 +105,7 @@ class TopicType(EnumType):
         "crime",
         "debarment",
         "export.control",
+        "export.control.linked",
         "export.risk",
         "poi",
         "mare.detained",

followthemoney/types/url.py

@@ -2,7 +2,7 @@ from typing import Optional, TYPE_CHECKING
 from rigour.urls import clean_url, compare_urls
 
 from followthemoney.types.common import PropertyType
-from followthemoney.util import const, dampen, defer as _
+from followthemoney.util import dampen, defer as _
 
 if TYPE_CHECKING:
     from followthemoney.proxy import EntityProxy
@@ -16,8 +16,8 @@ class UrlType(PropertyType):
     SCHEMES = ("http", "https", "ftp", "mailto")
     DEFAULT_SCHEME = "http"
 
-    name = const("url")
-    group = const("urls")
+    name = "url"
+    group = "urls"
     label = _("URL")
     plural = _("URLs")
     matchable = True

{followthemoney-4.3.0.dist-info → followthemoney-4.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: followthemoney
-Version: 4.3.0
+Version: 4.3.4
 Summary: A data model for anti corruption data modeling and analysis.
 Project-URL: Documentation, https://followthemoney.tech/
 Project-URL: Repository, https://github.com/opensanctions/followthemoney.git
@@ -48,9 +48,9 @@ Requires-Dist: prefixdate<1.0.0,>=0.5.0
 Requires-Dist: pydantic<3.0.0,>=2.11.0
 Requires-Dist: pytz>=2021.1
 Requires-Dist: pyyaml<7.0.0,>=5.0.0
-Requires-Dist: rdflib<7.3.0,>=6.2.0
+Requires-Dist: rdflib<7.5.0,>=6.2.0
 Requires-Dist: requests<3.0.0,>=2.21.0
-Requires-Dist: rigour<2.0.0,>=1.3.13
+Requires-Dist: rigour<2.0.0,>=1.4.0
 Requires-Dist: sqlalchemy[mypy]<3.0.0,>=2.0.0
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'

{followthemoney-4.3.0.dist-info → followthemoney-4.3.4.dist-info}/RECORD

@@ -1,18 +1,18 @@
-followthemoney/__init__.py,sha256=SGtXmqy22FtLMX0kcGDSUMbWNGUvoA13F5SUobauMg8,856
-followthemoney/compare.py,sha256=bZlnj2VMoe67q4Lyq_VwS1a-EJnEK1kC8prbs8jyL9E,5774
-followthemoney/entity.py,sha256=bBiX7hNquXemS3vYCUHKtWI_IqX43Z6i8RQDbZ7gXsg,3449
+followthemoney/__init__.py,sha256=UHPYwFuppho0TsOPG7vZw6KSsIDHX_Ar7gO1Vw7dLig,856
+followthemoney/compare.py,sha256=frgumsDv4Ru9UkNof62jDjKCxxpCgV1Rusfu8s20uGA,6327
+followthemoney/entity.py,sha256=YB6u7BMeQX5toAe7DndZBiPtzy0BQ5CKp3ix6kHxk3Y,3499
 followthemoney/exc.py,sha256=GyMgwY4QVm87hLevDfV7gM1MJsDqfNCi_UQw7F_A8X8,858
 followthemoney/graph.py,sha256=7X1CGHGvmktS2LSZqld2iXWzG7B831eCNYyBqamqEJ8,10921
 followthemoney/helpers.py,sha256=KCdv1XAE7KQEXBiXp52Kvuck7wMaeNVBM3uaFemcvb4,7873
 followthemoney/messages.py,sha256=zUEa9CFecU8nRafIzhN6TKCh1kEihiIyIS1qr8PxY4g,806
-followthemoney/model.py,sha256=bWFVNa-DhYzc8BdSXBZdG2ev6Nh9uHx6i4tin8DvEEU,7374
+followthemoney/model.py,sha256=chAUGob5tXWS0o8f0X6mSFCCnI2HoHE5pXU9O5ukrpc,7447
 followthemoney/names.py,sha256=LODQqExKEHdH4z6Mmbhlm0KeKRzGcptaSWzYXZ7lONI,1120
 followthemoney/namespace.py,sha256=utggu9IGA8bhgEYom3OUB1KxkAJR_TrMNbY5MUF_db8,4536
 followthemoney/ontology.py,sha256=WWY_PYQGl5Ket4zZBuZglzQxD2Bh9UqHok6GJNNX7GA,3001
-followthemoney/property.py,sha256=9qZ_o2iA-1llLMJ3O2hsW7c2XhkFU1YbvVqretGYUSA,7913
-followthemoney/proxy.py,sha256=5pMyP0JWWuBcvMIu3AXlW6Za7EEWWdFD2EZkD8UkbQw,19703
+followthemoney/property.py,sha256=1w7p9aKLxRqFRnl3PlssqmvulSErl_0D5T2SefT3UFU,8675
+followthemoney/proxy.py,sha256=xZUsT4W9sLojaSD8j6P2JQyQuOQKBWDVovm5epxvtI0,19674
 followthemoney/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-followthemoney/schema.py,sha256=WYnPE4Lego0pJHlojECEv0aO9Miw_YIvEb35HoDo4Zk,18087
+followthemoney/schema.py,sha256=dwZg0eZF7yaxP9fJ5NQUKWadWZYTo9U-sVzzXZn_6do,18500
 followthemoney/util.py,sha256=LoCSp1iE6VwXjotCkBXFRppeQs55726GzOuNIu3CvRE,4409
 followthemoney/value.py,sha256=BJ4Sj5Tg2kMrslR6FjQUr96d8Kt75U7ny9NgzVGT0ZE,2335
 followthemoney/cli/__init__.py,sha256=0mmz84uhXRp2qUn3syKnDXofU3MMAAe291s7htqX0Bg,187
@@ -54,7 +54,7 @@ followthemoney/schema/Audio.yaml,sha256=Eb1rZGUEOX7XDAj_1YIN28NCBzMvkopQBNwgHt_k
 followthemoney/schema/BankAccount.yaml,sha256=60v-VD296lW1Qq7fx--CzxfPNwfCcyMV6xIl8OrSy5g,1431
 followthemoney/schema/Call.yaml,sha256=kbVCnVxucBrEplxehXHThLSJAJjy_GhWan-IeZZjr0M,980
 followthemoney/schema/CallForTenders.yaml,sha256=2IWonTzfSbrkynMoEWqv5fekUeFM_xDKpKIbRe1XDbo,3227
-followthemoney/schema/Company.yaml,sha256=qWhk6HoSlep6oEjviXoV9ACTnfo7WZ5DSDvAkXMaQ5M,3455
+followthemoney/schema/Company.yaml,sha256=1P_JA2LIIQtzP_Y8FYM-a47VNSWneX8QjdmGD1DFpWQ,3527
 followthemoney/schema/Contract.yaml,sha256=aSPB64T1h-0nuLDv6krasUvvoPZgo6sWUbv60c3vmzI,1541
 followthemoney/schema/ContractAward.yaml,sha256=b2spaZHYCaP1yR1RCsrI7mUjk-fAF7BUE3dc8Vl3cUQ,1689
 followthemoney/schema/CourtCase.yaml,sha256=lcovnY0Ne_xcggvkqfCW_RHvsRKo8kFTCPCyovAXRtI,599
@@ -75,26 +75,26 @@ followthemoney/schema/Identification.yaml,sha256=6txjZs6-3Kn94c3G4tDeDt9Jb4FW55-
 followthemoney/schema/Image.yaml,sha256=wuznboWECGiV96_GQiXq1-oKNoxO8zKisR4xyusnEn8,394
 followthemoney/schema/Interest.yaml,sha256=VUrehmsN1WgtS1oAa5jn_JGtSkZGGYLGNahp-R5JhOQ,282
 followthemoney/schema/Interval.yaml,sha256=8YJQ51GI-GxvbjYs3uC593kQtCepWW_7ZiNnlbPm2aM,2084
-followthemoney/schema/LegalEntity.yaml,sha256=586aA1F5CO8rwf49LG3_iobm13zM4O21gL_TONte8oM,5054
+followthemoney/schema/LegalEntity.yaml,sha256=Yy28a9NYl6mgnNvNvApO2MAnfkkaZRfzl-GtRn56CFI,5101
 followthemoney/schema/License.yaml,sha256=bXESXY-JpSmc5sthZe4sssXhx50UoLPAMED9FvEUyRU,534
 followthemoney/schema/Membership.yaml,sha256=IPmaOX4Ai2r4sGcA5ig2WmLvWHb38akdxp4smEdDWOE,710
 followthemoney/schema/Mention.yaml,sha256=nBeulR_Jm4x75aJ7yNF0TAVhHJqXQaEzOutLIn_YU-4,1086
 followthemoney/schema/Message.yaml,sha256=PAxZ2NRFVvnOlp9Ohh5fJDEThjJ0jm3M2YCbJ9KtMuE,1565
 followthemoney/schema/Note.yaml,sha256=NohwtFupxIssZuEgQowiQWqKit4uQ-OatAu3yp9eJj4,411
 followthemoney/schema/Occupancy.yaml,sha256=WojlqzuWao84MJxRE9K6a-1D-Jtu78-0h6laODhdKw8,975
-followthemoney/schema/Organization.yaml,sha256=wPXU1ni0-3QzvttDq-gIjbAYHzcWoo3nsLGLw6cnHKI,1064
+followthemoney/schema/Organization.yaml,sha256=F_01GsdSsS2cUjJ732R6UfsiodylMITq23EiXdEuoDo,1136
 followthemoney/schema/Ownership.yaml,sha256=tLWESE9VX0aUuhe6C1pToq2-auPVZBdE3xvBmTRfmPc,1057
 followthemoney/schema/Package.yaml,sha256=gPr-P3lcg7OOAav_KVa8baK4yK57JwfcXwxXheD96UQ,310
 followthemoney/schema/Page.yaml,sha256=YjYqaH2sOry0z4xh44CsX_eyuRClD6ZS0d2o2uQXFbo,1062
 followthemoney/schema/Pages.yaml,sha256=KKPGZ06Ehp5mWIGnYfHUBN9jT03bk8nakw0pB5bA_7E,450
 followthemoney/schema/Passport.yaml,sha256=rpuLC86sdXnHF-prFQM4mAqYzlSGWKvPE4Cphtn2KRw,805
 followthemoney/schema/Payment.yaml,sha256=WRBJuj9ljsxLBs-0g9Z9UD87uR1RTtuUiYnWOnKr1qA,1757
-followthemoney/schema/Person.yaml,sha256=wS_URvex5pG_P5cv0UPafpaz3Jh9Z7CxHZjb3GwB85k,2798
+followthemoney/schema/Person.yaml,sha256=485xdaX3YYfJNtMkKuwRS78dD2l2bMYjGCmo-NqTvOY,2845
 followthemoney/schema/PlainText.yaml,sha256=hfnVi-HmQeDbqDquSpkPJax9hNm86ioXGr4hzNzyPFE,278
 followthemoney/schema/Position.yaml,sha256=ZpxjWOLxwva_on32r9WD5ys0Ty3YxCju41mg9HG-pe0,1308
 followthemoney/schema/Project.yaml,sha256=2svtyGJopS0UrqPiuYGpBzj30V7k3LRDX4N1U56y4yY,462
 followthemoney/schema/ProjectParticipant.yaml,sha256=xNehEu90uqUfboNouezhZQ8ZQLxzWq1yyNO4kua-Lyc,727
-followthemoney/schema/PublicBody.yaml,sha256=BNfLBqH1OapoEninAjWmqZx_n-G5QUnzzydW7300TiY,301
+followthemoney/schema/PublicBody.yaml,sha256=uw4Ok36E8J5d7tyijHG9Sf_iNFOpUhGpo6UyKgTQp3Q,348
 followthemoney/schema/RealEstate.yaml,sha256=NWFHXqEHskYQN-kvQESZpu74nztShqoYSZEjZAr-DHM,1363
 followthemoney/schema/Representation.yaml,sha256=sCvFnUDQaElq2cqSB0rILcMYb2gaMZqlzxlHxyX9IGg,792
 followthemoney/schema/Risk.yaml,sha256=2BRVBqb6wiLHxb_V50P-YMAOhjC64UVHDyh5PASpCIA,728
@@ -104,7 +104,7 @@ followthemoney/schema/Similar.yaml,sha256=gD8rZEaPQWzU-rEfsKdn62uEucF3KxYBcPMoSd
 followthemoney/schema/Succession.yaml,sha256=RMJQqZ4Fv88N1RvWTAgjYg9BB5cELSj5CCAjM681Fpg,749
 followthemoney/schema/Table.yaml,sha256=GcsIAgSO9t2tvObA9zU2HhxlSqTe9CePmUnagu1Z0vI,641
 followthemoney/schema/TaxRoll.yaml,sha256=ugMzaaS7uyq2OLD50eGLcfvd6Cg0cSt65-T9GVqpRSA,746
-followthemoney/schema/Thing.yaml,sha256=hh1oMDQzWiSs1TamBNonmwEdlh2TVrNc3w9hWW8iSeY,2716
+followthemoney/schema/Thing.yaml,sha256=iUaGvGRBqhsVUg-Cx_CNw9WewlWsl9vylU2wiFDQ1qg,2975
 followthemoney/schema/Trip.yaml,sha256=nLQD_ApmVJ8D56Czl7K700hhNZjzFV9FOQ3NBSQDLiM,771
 followthemoney/schema/UnknownLink.yaml,sha256=lneS_HZNgeLyJxwzWnLx0ZoyY3MXt99I_K2X_o9z5g8,682
 followthemoney/schema/UserAccount.yaml,sha256=2bbPKNtt1R3zWSSkaq_SVzRPfFzX74kAxwtIxTymHA8,840
@@ -117,7 +117,7 @@ followthemoney/statement/__init__.py,sha256=7m2VUCAuqNZXIY0WFJRFkw5UG14QuxATL4f_
 followthemoney/statement/entity.py,sha256=oeudwhqfYLJKqbzxEydasMHqevkDASNyYN6s0yddW6I,18755
 followthemoney/statement/serialize.py,sha256=9eXzQ1biR2mSxWRID5C7xDdku4b4ZImHeRJ53yLZ0yo,7225
 followthemoney/statement/statement.py,sha256=Ae-EYuzS8S12BkaRqrvMuI1C7YwlRKa5C_pTBELyNMM,8029
-followthemoney/statement/util.py,sha256=B-ozuRc1TWvpop52873Pqt5OPj8H6uk4KyRJLfAhr10,780
+followthemoney/statement/util.py,sha256=QMYSwAcnh2fCM1LtH_-v8Z5GdwOZfUTT1UkQ_ZMQ470,797
 followthemoney/translations/messages.pot,sha256=JhtY9NJ9wP_EAX4APxOqMyvKcX53oIC9kAxBsliJkf4,107703
 followthemoney/translations/ar/LC_MESSAGES/followthemoney.mo,sha256=uhb2crSNh8K2ts_QUeD2wvgWgzzpLJWRzXok-Uyx3Zk,38795
 followthemoney/translations/ar/LC_MESSAGES/followthemoney.po,sha256=DuIfvR5v0sPGwFbeg3y6_jCbeglvHWXQ2LDH6prfwLc,121326
@@ -142,27 +142,27 @@ followthemoney/translations/ru/LC_MESSAGES/followthemoney.po,sha256=7SQWytOTvoAQ
 followthemoney/translations/tr/LC_MESSAGES/followthemoney.mo,sha256=SC84e_ZF_oFJG1NKdyZY_W6Kb6POORZB6wdeAcEWmnE,487
 followthemoney/translations/tr/LC_MESSAGES/followthemoney.po,sha256=AZC3marhtVVq8Ck1FOgnt4sbDMz548nX48O9GDwImbQ,89826
 followthemoney/types/__init__.py,sha256=rWwQeiuMh2BNIuvhpMfJ4bPADDvt9Axu1eedvNFi0qY,3350
-followthemoney/types/address.py,sha256=KsKLa9H8FfSkYF8VGslRnt-miGeni1rKICS8t1rzfzo,2235
-followthemoney/types/checksum.py,sha256=zZrU8WX4CY3Vta_vOyfgDNzIwbmtje7AaDv3O1fBMnk,823
+followthemoney/types/address.py,sha256=Gc-hqz00dRRkeANqkyPD2wtt7ksR9wMf4CX-U-5XvMo,2214
+followthemoney/types/checksum.py,sha256=_0ev2Wwtd4iX_bLz0Lu-xcJIxNfH_V9kBKKtuZhoAwg,802
 followthemoney/types/common.py,sha256=4ks7zPT8rknrGSd4JFc1zRkS-TL4SX-25_ZbjcVDos0,10081
-followthemoney/types/country.py,sha256=n8vihijDVud_3Ra-as4Ize0jf_HbcdKVR5YX3TlKZy0,1533
-followthemoney/types/date.py,sha256=PjcaEyW6CBzf0-gHWKUsKjWIaD3AVBEl0zLSRQOVXxc,3105
+followthemoney/types/country.py,sha256=X3Z1j6rIiCITpLtpFXwjTIh9uJwI99_gmPMJx8Jsq2w,1512
+followthemoney/types/date.py,sha256=O3Xav9QNBqjy7LuUWiZrUdGrOvwwOdk6ea5qQEStIwQ,3084
 followthemoney/types/email.py,sha256=L3RTYrMABlNQF7hCynXGfzoj6YNEHW5JAY_BwuhoZdA,3375
-followthemoney/types/entity.py,sha256=oDxVEhuxyU1ScpOpebPpUm3o0I9j_p7Qrq-t5yNpluQ,2338
-followthemoney/types/gender.py,sha256=fi9iKLbjAUxDCLBtU1MxWidxv7KgCY2eH5746FYlEGk,1725
-followthemoney/types/identifier.py,sha256=hzD188FtwG0w3TcmbnDwnUMc8MZVcWgQJKGAvrwygc4,2296
-followthemoney/types/ip.py,sha256=mMFTODFiXAJROCUYJvoLAShyIiTIWVmMBh5zT_GquYM,1300
-followthemoney/types/json.py,sha256=V3qJD5RxJykNX51u3w1Nx9xqoNBnkulhzkJI9XMYKFo,1690
-followthemoney/types/language.py,sha256=SXgRRH-DyPmyyrqYurSyMiG6WHB8a0Gw81XxroEGD-c,2747
-followthemoney/types/mimetype.py,sha256=NdpqVLx3Bre_myYvnbjmdd5wZBf01tllrbhegjO8_m0,1263
-followthemoney/types/name.py,sha256=ZWGDebv01qByh_yBYOVoS3Edlm3_JVPShQMklKc6ZOA,2384
-followthemoney/types/number.py,sha256=OdVuHDd4IYIIHhx_317JKeMjBAGtsJ2TAcxoZKZ4MkY,3948
-followthemoney/types/phone.py,sha256=r8uRqWinS0CYnYBTs405k5gO4jeatUDgjdzzijoMKJE,3811
-followthemoney/types/string.py,sha256=fqyTauAm4mNnNaoH-yH087RBbNh-G5ZZUO3awTGQUUg,1230
-followthemoney/types/topic.py,sha256=Mi0Gx0m3bDeTmyuvM6jdRMqv81O03U4eI99R13KGu2Y,4503
-followthemoney/types/url.py,sha256=QFpS_JIV8unFHuh_uGv22SWUUkocBoOpzLsAJWom_gI,1455
-followthemoney-4.3.0.dist-info/METADATA,sha256=dyrwBXiefNsSpmwOcsP-TsEnJBqmn9DY9vJsMhFVwk0,6748
-followthemoney-4.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-followthemoney-4.3.0.dist-info/entry_points.txt,sha256=caoFTlf213jhg5sz3TNSofutjUTzaKtWATuSIdd9Cps,653
-followthemoney-4.3.0.dist-info/licenses/LICENSE,sha256=H6_EVXisnJC0-18CjXIaqrBSFq_VH3OnS7u3dccOv6g,1148
-followthemoney-4.3.0.dist-info/RECORD,,
+followthemoney/types/entity.py,sha256=56h6x8Ct7hWZIC3BjZHmRKGy9Ff2vuULNWH3xDRsKiU,2317
+followthemoney/types/gender.py,sha256=XY9us98Sk25O1xnHN-88tbv9pHy6Mn7SR8GRYi6v5gI,1683
+followthemoney/types/identifier.py,sha256=TYJwE7urjHFxEcDuiZMxGoCN6n34rAIdCt5_96Y7vI0,2198
+followthemoney/types/ip.py,sha256=rCXkRrh_jDeWAhswCgSe6Z4uhIW7yvLAxIEw4x1SM3A,1279
+followthemoney/types/json.py,sha256=Hefwns1-ziJf310MWvdfX5ICkOgj9cnnMJuqq1e6qKY,1676
+followthemoney/types/language.py,sha256=JDFCO9g9lvgKihhYTz6e7TbJd3V9RTGJlS8kDn6aSCY,2726
+followthemoney/types/mimetype.py,sha256=oqVP8EfGckPAI3WAziHomp6oUN7KXdIPWzGZPsRtIA8,1242
+followthemoney/types/name.py,sha256=zd0aC4VGp1SYUI8Rj0-ZXlrpUI7ZcnJIljZqsEsV-CY,2363
+followthemoney/types/number.py,sha256=vpAyhmc7UQlIm8h7Z5k8k4cTk37ykRF-AgYA1r_g1QQ,3934
+followthemoney/types/phone.py,sha256=_HanfxxTV7jp75gZO2evBc9HWwQTxEMQRaoVDcoXDIQ,3790
+followthemoney/types/string.py,sha256=SEh3xqQCnm377PGvwfR6ao85pHJCNeCUWBKnvccrJ7I,1216
+followthemoney/types/topic.py,sha256=9FIH_WmwVOFg1CJRBF4KeE6vNTn-QQkzsKU5XaMqNJ0,4604
+followthemoney/types/url.py,sha256=sSHKtzvm4kc-VTvNCPIDykOG1hUoawhORj6Bklo0a2A,1434
+followthemoney-4.3.4.dist-info/METADATA,sha256=H3K0seI3SN6axQwxgjGK0zErE7ySmoYtOxDom-waNDU,6747
+followthemoney-4.3.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+followthemoney-4.3.4.dist-info/entry_points.txt,sha256=caoFTlf213jhg5sz3TNSofutjUTzaKtWATuSIdd9Cps,653
+followthemoney-4.3.4.dist-info/licenses/LICENSE,sha256=H6_EVXisnJC0-18CjXIaqrBSFq_VH3OnS7u3dccOv6g,1148
+followthemoney-4.3.4.dist-info/RECORD,,

{followthemoney-4.3.0.dist-info → followthemoney-4.3.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any