followthemoney 4.1.1__py3-none-any.whl → 4.2.0__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.1.1"
+__version__ = "4.2.0"
 
 # Data model singleton
 model = Model.instance()

followthemoney/entity.py

@@ -20,6 +20,21 @@ class ValueEntity(EntityProxy):
     applications should use this entity class as the base class.
     """
 
+    __slots__ = [
+        "schema",
+        "id",
+        "key_prefix",
+        "context",
+        "_properties",
+        "_size",
+        "_caption",
+        "datasets",
+        "referents",
+        "first_seen",
+        "last_seen",
+        "last_change",
+    ]
+
     def __init__(
         self,
         schema: Schema,

followthemoney/helpers.py

@@ -7,7 +7,7 @@
 # probably be the first place to break.
 from os.path import splitext
 from typing import Iterable, List, Optional, Set
-from normality import safe_filename
+from normality import safe_filename, squash_spaces
 from mimetypes import guess_extension
 from itertools import product
 from datetime import datetime, timedelta
@@ -148,23 +148,21 @@ def inline_names(entity: E, related: E) -> None:
 
 
 def combine_names(entity: E) -> E:
-    """This function will try to build names from name parts provided as part
-    of a person entity. This is of course impossible to do culturally correctly
-    for the whole planet at once, so it should be mostly used for internal-facing
-    (e.g. matching) processes."""
+    """Build a full names from name parts of a Person entity and add them as aliases.
+
+    This is of course impossible to do culturally correctly for the whole planet at
+    once, so it should be mostly used for internal-facing (e.g. matching) processes."""
     if entity.schema.is_a("Person"):
         first_names = entity.get("firstName")
-        second_names = entity.get("secondName")
-        second_names.append("")
-        middle_names = entity.get("middleName")
-        middle_names.append("")
-        father_names = entity.get("fatherName")
-        father_names.append("")
+        second_names = entity.get("secondName") + [""]
+        middle_names = entity.get("middleName") + [""]
+        father_names = entity.get("fatherName") + [""]
+        mother_names = entity.get("motherName") + [""]
         last_names = entity.get("lastName")
-        for (first, second, middle, father, last) in product(
-            first_names, second_names, middle_names, father_names, last_names
+        for (first, second, middle, father, mother, last) in product(
+            first_names, second_names, middle_names, father_names, mother_names, last_names
         ):
-            name = join_text(first, second, middle, father, last)
+            name = squash_spaces(" ".join([first, second, middle, father, mother, last]))
             if name is not None:
                 entity.add("alias", name)
 

followthemoney/schema/Risk.yaml

@@ -0,0 +1,43 @@
+Risk:
+  label: Risk
+  plural: Risks
+  description: "A risk associated with an entity"
+  extends:
+    - Interval
+  matchable: false
+  featured:
+    - entity
+    - country
+    - reason
+    - status
+    - startDate
+  required:
+    - entity
+  caption:
+    - reason
+    - status
+  properties:
+    entity:
+      label: "Entity"
+      reverse:
+        name: risks
+        label: "Risks"
+      type: entity
+      range: Thing
+    topics:
+      label: Topics
+      type: topic
+    status:
+      label: "Status"
+    duration:
+      label: "Duration"
+      type: number
+    reason:
+      label: "Reason"
+      type: text
+    country:
+      label: "Country"
+      type: country
+    listingDate:
+      label: "Listing date"
+      type: date

followthemoney/schema/Vessel.yaml

@@ -38,6 +38,9 @@ Vessel:
     grossRegisteredTonnage:
       label: Gross Registered Tonnage
       type: number
+    deadweightTonnage:
+      label: Deadweight Tonnage
+      type: number
     nameChangeDate:
       label: Date of Name Change
       type: date

followthemoney/statement/entity.py

@@ -372,6 +372,7 @@ class StatementEntity(EntityProxy):
         }
         referents: Set[Optional[str]] = set(self.extra_referents)
         datasets = set(self.datasets)
+        origins: Set[str] = set()
         first_seen = None
         last_seen = None
         for stmts in self._statements.values():
@@ -385,9 +386,13 @@ class StatementEntity(EntityProxy):
                 if stmt.entity_id is not None and stmt.entity_id != self.id:
                     referents.add(stmt.entity_id)
                 datasets.add(stmt.dataset)
+                if stmt.origin is not None:
+                    origins.add(stmt.origin)
 
         data["referents"] = list(referents)
         data["datasets"] = list(datasets)
+        if origins:
+            data["origin"] = list(origins)
 
         if first_seen is not None:
             data["first_seen"] = first_seen

followthemoney/types/country.py

@@ -1,7 +1,6 @@
-import countrynames
 from typing import Optional, TYPE_CHECKING
 from babel.core import Locale
-from rigour.territories import get_territory, get_ftm_countries
+from rigour.territories import get_ftm_countries, lookup_territory
 
 from followthemoney.types.common import EnumType, EnumValues
 from followthemoney.util import const, defer as _
@@ -37,16 +36,11 @@ class CountryType(EnumType):
 
         The input may be a country code, a country name, etc.
         """
-        territory = get_territory(text)
+        territory = lookup_territory(text, fuzzy=fuzzy)
         if territory is not None:
             ftm_country = territory.ftm_country
             if ftm_country is not None:
                 return ftm_country
-        code = countrynames.to_code(text, fuzzy=fuzzy)
-        if code is not None:
-            territory = get_territory(code)
-            if territory is not None:
-                return territory.ftm_country
         return None
 
     def country_hint(self, value: str) -> str:

followthemoney/types/topic.py

@@ -55,10 +55,14 @@ class TopicType(EnumType):
         "gov.judicial": _("Judicial branch of government"),
         "gov.security": _("Security services"),
         "gov.financial": _("Central banking and financial integrity"),
+        "gov.religion": _("Religious leadership"),
         "fin": _("Financial services"),
         "fin.bank": _("Bank"),
         "fin.fund": _("Fund"),
         "fin.adivsor": _("Financial advisor"),
+        "mare.detained": _("Maritime detention"),
+        "mare.shadow": _("Shadow fleet"),
+        "mare.sts": _("Ship-to-ship transfer"),
         "reg.action": _("Regulator action"),
         "reg.warn": _("Regulator warning"),
         "role.pep": _("Politician"),
@@ -87,5 +91,33 @@ class TopicType(EnumType):
         "poi": _("Person of interest"),
     }
 
+    RISKS = {
+        "corp.disqual",
+        "crime.boss",
+        "crime.fin",
+        "crime.fraud",
+        "crime.terror",
+        "crime.theft",
+        "crime.traffick",
+        "crime.war",
+        "crime",
+        "debarment",
+        "export.control",
+        "export.risk",
+        "poi",
+        "mare.detained",
+        "mare.shadow",
+        "reg.action",
+        "reg.warn",
+        "role.oligarch",
+        "role.pep",
+        "role.rca",
+        "sanction.counter",
+        "sanction.linked",
+        "sanction",
+        "wanted",
+    }
+    """A set of topics that imply a counterparty risk in business dealings."""
+
     def _locale_names(self, locale: Locale) -> EnumValues:
         return {k: gettext(v) for (k, v) in self._TOPICS.items()}

{followthemoney-4.1.1.dist-info → followthemoney-4.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: followthemoney
-Version: 4.1.1
+Version: 4.2.0
 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
@@ -39,7 +39,6 @@ Requires-Python: >=3.10
 Requires-Dist: babel<3.0.0,>=2.14.0
 Requires-Dist: banal<1.1.0,>=1.0.6
 Requires-Dist: click<9.0.0,>=8.0
-Requires-Dist: countrynames<2.0.0,>=1.13.0
 Requires-Dist: networkx<3.5,>=2.5
 Requires-Dist: normality<4.0.0,>=3.0.1
 Requires-Dist: openpyxl<4.0.0,>=3.0.5
@@ -51,7 +50,7 @@ Requires-Dist: pytz>=2021.1
 Requires-Dist: pyyaml<7.0.0,>=5.0.0
 Requires-Dist: rdflib<7.2.0,>=6.2.0
 Requires-Dist: requests<3.0.0,>=2.21.0
-Requires-Dist: rigour<2.0.0,>=1.1.1
+Requires-Dist: rigour<2.0.0,>=1.2.0
 Requires-Dist: sqlalchemy[mypy]<3.0.0,>=2.0.0
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'

{followthemoney-4.1.1.dist-info → followthemoney-4.2.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-followthemoney/__init__.py,sha256=_drb_fsELoJ6qpcyjNSJbn8OVaBH-ZdeDQKaFJ1S_Qk,856
+followthemoney/__init__.py,sha256=NqtJnba71wycGIhiZrBIfOYbafL_Tm_Qd0ouNm2EYPA,856
 followthemoney/compare.py,sha256=bZlnj2VMoe67q4Lyq_VwS1a-EJnEK1kC8prbs8jyL9E,5774
-followthemoney/entity.py,sha256=hHY9yysn_iFTtXqcHg4hHhYfmgLw4prWul8rD1X82Y0,3184
+followthemoney/entity.py,sha256=bBiX7hNquXemS3vYCUHKtWI_IqX43Z6i8RQDbZ7gXsg,3449
 followthemoney/exc.py,sha256=GyMgwY4QVm87hLevDfV7gM1MJsDqfNCi_UQw7F_A8X8,858
 followthemoney/graph.py,sha256=7X1CGHGvmktS2LSZqld2iXWzG7B831eCNYyBqamqEJ8,10921
-followthemoney/helpers.py,sha256=Btb6BlHg_c-qCXZo-NP_LURKG-qu-QD3Fj1ev_c7Xic,7956
+followthemoney/helpers.py,sha256=EsneNJ5DZXHTPUYfXLxGESphsPwCtGiWv-71vvVBWus,7982
 followthemoney/messages.py,sha256=zUEa9CFecU8nRafIzhN6TKCh1kEihiIyIS1qr8PxY4g,806
 followthemoney/model.py,sha256=bWFVNa-DhYzc8BdSXBZdG2ev6Nh9uHx6i4tin8DvEEU,7374
 followthemoney/names.py,sha256=LODQqExKEHdH4z6Mmbhlm0KeKRzGcptaSWzYXZ7lONI,1120
@@ -97,6 +97,7 @@ followthemoney/schema/ProjectParticipant.yaml,sha256=xNehEu90uqUfboNouezhZQ8ZQLx
 followthemoney/schema/PublicBody.yaml,sha256=BNfLBqH1OapoEninAjWmqZx_n-G5QUnzzydW7300TiY,301
 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
 followthemoney/schema/Sanction.yaml,sha256=-3_NrTp1KPSsSMkttFzwo81zFKplx15w-9EmwPnE8-o,1278
 followthemoney/schema/Security.yaml,sha256=w8Och0cslWjHPAs60HZ6JarEXdIbqGlIbN1NlvgN_7Y,1212
 followthemoney/schema/Similar.yaml,sha256=gD8rZEaPQWzU-rEfsKdn62uEucF3KxYBcPMoSdnxvME,817
@@ -109,11 +110,11 @@ followthemoney/schema/UnknownLink.yaml,sha256=lneS_HZNgeLyJxwzWnLx0ZoyY3MXt99I_K
 followthemoney/schema/UserAccount.yaml,sha256=2bbPKNtt1R3zWSSkaq_SVzRPfFzX74kAxwtIxTymHA8,840
 followthemoney/schema/Value.yaml,sha256=cNHTCtakMTXDW0Qpb6ArZodi9rMJ-Ebvp1WsOIRRzw4,310
 followthemoney/schema/Vehicle.yaml,sha256=Ypl4A5HJFOZfZh3DK0ewN-hyJuCMcovR0mPNddIZrOA,1051
-followthemoney/schema/Vessel.yaml,sha256=nFaUJ_0BzFJstvog1iDvwV9DHKHr9ky4DLb1NZGGh1E,1096
+followthemoney/schema/Vessel.yaml,sha256=zWHUfSK8g6Pz58ZyCaK0AFJ4u_UHjEIUGC4c_7oS11Y,1170
 followthemoney/schema/Video.yaml,sha256=LY3DYMWTHXiAhL0hxBCNCz50cp2sPbUlEhhig5Fbjos,327
 followthemoney/schema/Workbook.yaml,sha256=iikWPElz4klA7SkWH7eae6xqhbkMCIP_3zdeXzFEMU0,354
 followthemoney/statement/__init__.py,sha256=7m2VUCAuqNZXIY0WFJRFkw5UG14QuxATL4f_xbqKwhw,633
-followthemoney/statement/entity.py,sha256=gXvBTBwHL-GfmBXdw9HoP6WSbiwBOrTTOllQwkIObyQ,15986
+followthemoney/statement/entity.py,sha256=MKHGmFeDwcW2lTbAeKSdU53YwDuoLm5iKy4roeb8_lo,16172
 followthemoney/statement/serialize.py,sha256=9eXzQ1biR2mSxWRID5C7xDdku4b4ZImHeRJ53yLZ0yo,7225
 followthemoney/statement/statement.py,sha256=Ae-EYuzS8S12BkaRqrvMuI1C7YwlRKa5C_pTBELyNMM,8029
 followthemoney/statement/util.py,sha256=B-ozuRc1TWvpop52873Pqt5OPj8H6uk4KyRJLfAhr10,780
@@ -144,7 +145,7 @@ followthemoney/types/__init__.py,sha256=rWwQeiuMh2BNIuvhpMfJ4bPADDvt9Axu1eedvNFi
 followthemoney/types/address.py,sha256=nMFCj5QJyqA1ddpUmDLpRTum0nGXE-J70_WGnaLXnYo,2130
 followthemoney/types/checksum.py,sha256=zZrU8WX4CY3Vta_vOyfgDNzIwbmtje7AaDv3O1fBMnk,823
 followthemoney/types/common.py,sha256=4ks7zPT8rknrGSd4JFc1zRkS-TL4SX-25_ZbjcVDos0,10081
-followthemoney/types/country.py,sha256=mUCjwhUbA5Ef5HYuKb1KbH4aZ3MxaNwE1p77uOZMuG0,1745
+followthemoney/types/country.py,sha256=n8vihijDVud_3Ra-as4Ize0jf_HbcdKVR5YX3TlKZy0,1533
 followthemoney/types/date.py,sha256=PjcaEyW6CBzf0-gHWKUsKjWIaD3AVBEl0zLSRQOVXxc,3105
 followthemoney/types/email.py,sha256=L3RTYrMABlNQF7hCynXGfzoj6YNEHW5JAY_BwuhoZdA,3375
 followthemoney/types/entity.py,sha256=oDxVEhuxyU1ScpOpebPpUm3o0I9j_p7Qrq-t5yNpluQ,2338
@@ -158,10 +159,10 @@ followthemoney/types/name.py,sha256=ZWGDebv01qByh_yBYOVoS3Edlm3_JVPShQMklKc6ZOA,
 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=CS5IoI8gm4MSVxfV6K4mGd20_tT1SaKMkcOt_ObSsAg,3678
+followthemoney/types/topic.py,sha256=Mi0Gx0m3bDeTmyuvM6jdRMqv81O03U4eI99R13KGu2Y,4503
 followthemoney/types/url.py,sha256=QFpS_JIV8unFHuh_uGv22SWUUkocBoOpzLsAJWom_gI,1455
-followthemoney-4.1.1.dist-info/METADATA,sha256=OatNsAWxjixfh_s-iGY046rcZRoCs9p-6rPLwB8VxTM,6791
-followthemoney-4.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-followthemoney-4.1.1.dist-info/entry_points.txt,sha256=caoFTlf213jhg5sz3TNSofutjUTzaKtWATuSIdd9Cps,653
-followthemoney-4.1.1.dist-info/licenses/LICENSE,sha256=H6_EVXisnJC0-18CjXIaqrBSFq_VH3OnS7u3dccOv6g,1148
-followthemoney-4.1.1.dist-info/RECORD,,
+followthemoney-4.2.0.dist-info/METADATA,sha256=I1JXOtpniNIMi2jPoM1Vpx_IaYezqCP8l9e3qhldGtc,6748
+followthemoney-4.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+followthemoney-4.2.0.dist-info/entry_points.txt,sha256=caoFTlf213jhg5sz3TNSofutjUTzaKtWATuSIdd9Cps,653
+followthemoney-4.2.0.dist-info/licenses/LICENSE,sha256=H6_EVXisnJC0-18CjXIaqrBSFq_VH3OnS7u3dccOv6g,1148
+followthemoney-4.2.0.dist-info/RECORD,,