followthemoney 3.7.8__py2.py3-none-any.whl → 3.7.10__py2.py3-none-any.whl

followthemoney/__init__.py

@@ -3,7 +3,7 @@ import os
 from followthemoney.model import Model
 from followthemoney.util import set_model_locale
 
-__version__ = "3.7.8"
+__version__ = "3.7.10"
 
 
 model_path = os.path.dirname(__file__)

followthemoney/schema/LegalEntity.yaml

@@ -110,13 +110,13 @@ LegalEntity:
       label: "INN"
       description: "Russian company ID"
       type: identifier
-      # format: inn
+      format: inn
       maxLength: 32
     ogrnCode:
       label: "OGRN"
       description: "Major State Registration Number"
       type: identifier
-      # format: ogrn
+      format: ogrn
       maxLength: 32
     leiCode:
       # cf. https://www.gleif.org/en/about-lei/introducing-the-legal-entity-identifier-lei
@@ -130,6 +130,11 @@ LegalEntity:
       description: "Data Universal Numbering System - Dun & Bradstreet identifier"
       type: identifier
       maxLength: 16
+    uniqueEntityId:
+      label: "Unique Entity ID"
+      description: "UEI from SAM.gov"
+      type: identifier
+      maxLength: 32
     npiCode:
       label: "NPI"
       description: "National Provider Identifier"

followthemoney/schema/Vessel.yaml

@@ -44,6 +44,7 @@ Vessel:
       type: identifier
     pastFlags:
       label: Past Flags
+      type: country
     pastTypes:
       label: Past Types
     #buildDate:

followthemoney/types/language.py

@@ -4,7 +4,7 @@ from rigour.langs import iso_639_alpha3
 
 from followthemoney.types.common import EnumType, EnumValues
 from followthemoney.rdf import URIRef, Identifier
-from followthemoney.util import defer as _
+from followthemoney.util import defer as _, gettext
 from followthemoney.util import get_env_list
 
 if TYPE_CHECKING:
@@ -93,12 +93,16 @@ class LanguageType(EnumType):
     LANGUAGES = [lang.lower().strip() for lang in LANGUAGES]
 
     def _locale_names(self, locale: Locale) -> EnumValues:
-        names = {}
+        names = {
+            "ara": gettext("Arabic"),
+            "nor": gettext("Norwegian"),
+        }
         for lang in self.LANGUAGES:
-            names[lang] = lang
+            if lang not in names:
+                names[lang] = lang
         for code, label in locale.languages.items():
             code = iso_639_alpha3(code)
-            if code in self.LANGUAGES:
+            if code in self.LANGUAGES and names[code] == code:
                 names[code] = label
         return names
 

followthemoney/types/name.py

@@ -1,8 +1,9 @@
 from typing import TYPE_CHECKING, Optional, Sequence
-from rigour.text.distance import levenshtein_similarity
-from rigour.names import pick_name
 from normality import slugify
 from normality.cleaning import collapse_spaces, strip_quotes
+from rigour.env import MAX_NAME_LENGTH
+from rigour.names import pick_name
+from rigour.text.distance import levenshtein_similarity
 from fingerprints.cleanup import clean_name_light
 
 from followthemoney.types.common import PropertyType
@@ -27,7 +28,7 @@ class NameType(PropertyType):
     plural = _("Names")
     matchable = True
     pivot = True
-    max_length = 384
+    max_length = MAX_NAME_LENGTH
 
     def clean_text(
         self,

{followthemoney-3.7.8.dist-info → followthemoney-3.7.10.dist-info}/METADATA

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: followthemoney
-Version: 3.7.8
+Version: 3.7.10
+Summary: UNKNOWN
 Home-page: https://followthemoney.tech/
 Author: Organized Crime and Corruption Reporting Project
 Author-email: data@occrp.org
 License: MIT
+Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -16,7 +18,7 @@ Requires-Dist: pyyaml<7.0.0,>=5.0.0
 Requires-Dist: types-PyYAML
 Requires-Dist: sqlalchemy2-stubs
 Requires-Dist: banal<1.1.0,>=1.0.6
-Requires-Dist: rigour<1.0.0,>=0.7.1
+Requires-Dist: rigour<1.0.0,>=0.7.2
 Requires-Dist: click<9.0.0,>=8.0
 Requires-Dist: stringcase<2.0.0,>=1.2.0
 Requires-Dist: requests<3.0.0,>=2.21.0
@@ -125,3 +127,5 @@ or `major` arguments.
 When the schema is updated, please update the docs, ideally including the
 diagrams. For the RDF namespace and JavaScript version of the model, 
 run `make generate`.
+
+

{followthemoney-3.7.8.dist-info → followthemoney-3.7.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-followthemoney/__init__.py,sha256=36Ko-kGxoHZPVwjUrkAv0bmQp1gE_rzRIUXJ-fIdtJ8,360
+followthemoney/__init__.py,sha256=GVJhrN5r5Bob0H2yXxOMUaZZwGcgfqJ_6CZqhR7lsXM,361
 followthemoney/compare.py,sha256=1GFkCfTzA8QR0CH90kvySR8hvl9hQRUerW5Xw2Ivmpg,5134
 followthemoney/exc.py,sha256=ynZs_UnTVxHR-iBfat_CpVLraYzVX5yLtVf5Ti14hl4,734
 followthemoney/graph.py,sha256=VNDKrUBkz_-DmKsr5v-Xm8VfxzabnTwkU_MFk92_TjA,10848
@@ -67,7 +67,7 @@ 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=WtmSoBngajhpNLtDZ8Ocpdd0I0tLG-7A4afuHXxssow,1919
-followthemoney/schema/LegalEntity.yaml,sha256=OiHgeDAnCtfv2VOMjVetF7dupcQfitdYVunRGS0Ztks,3965
+followthemoney/schema/LegalEntity.yaml,sha256=mJsbL4fCBgSm6Xar_Nk8VO2I4imJ6Y2WNYypx8UfeSQ,4094
 followthemoney/schema/License.yaml,sha256=9Ye5vGEBhi7ttGqf0DdAGCJCN3zz5HtGu52dCcmCsQk,452
 followthemoney/schema/Membership.yaml,sha256=IPmaOX4Ai2r4sGcA5ig2WmLvWHb38akdxp4smEdDWOE,710
 followthemoney/schema/Mention.yaml,sha256=nBeulR_Jm4x75aJ7yNF0TAVhHJqXQaEzOutLIn_YU-4,1086
@@ -102,7 +102,7 @@ followthemoney/schema/UnknownLink.yaml,sha256=lneS_HZNgeLyJxwzWnLx0ZoyY3MXt99I_K
 followthemoney/schema/UserAccount.yaml,sha256=V1JWwwcggCO4G9ByJY9zlQ0uOVp8HQK2mRXwqaGJnBM,763
 followthemoney/schema/Value.yaml,sha256=cNHTCtakMTXDW0Qpb6ArZodi9rMJ-Ebvp1WsOIRRzw4,310
 followthemoney/schema/Vehicle.yaml,sha256=WyjfHL7XxEQQ1h0IyOBYKAZ40BEghQaM7_mkFnWyVBg,990
-followthemoney/schema/Vessel.yaml,sha256=k6_EofFv_hW8TkgVE2wQ5AKA7QH7dk6b1ghuVb6T3Yg,1039
+followthemoney/schema/Vessel.yaml,sha256=aEqCXJ2h2J_UK6hdRUrA2w8Rqb43s8I4yqeICcfzF1w,1059
 followthemoney/schema/Video.yaml,sha256=LY3DYMWTHXiAhL0hxBCNCz50cp2sPbUlEhhig5Fbjos,327
 followthemoney/schema/Workbook.yaml,sha256=iikWPElz4klA7SkWH7eae6xqhbkMCIP_3zdeXzFEMU0,354
 followthemoney/translations/messages.pot,sha256=P3zcZ-gJhBi8Db7XjaSijhvFhZAInhpcwsA1Vlwjuzg,106899
@@ -141,9 +141,9 @@ followthemoney/types/iban.py,sha256=QYD49erJCB6I2nbtTagRMvpa4RyjezfB4Fpat2QLwAc,
 followthemoney/types/identifier.py,sha256=Gk4h75_KyjkdtomrK9Ldsh9rD7-bsenFryevJFwqlX0,2036
 followthemoney/types/ip.py,sha256=BxGARP9JWEWvyRnr7A7xUNwmTxyFd9kwXSZrKR0TK2Q,1412
 followthemoney/types/json.py,sha256=Hefwns1-ziJf310MWvdfX5ICkOgj9cnnMJuqq1e6qKY,1676
-followthemoney/types/language.py,sha256=gbOnrScpC8bOwlbygaMZa-mddoJonX3GPhCHg03i_0I,2632
+followthemoney/types/language.py,sha256=_EKfGXNkzEZyFtLau-jDRxIxebMe4gEMc60aeQ26H9A,2791
 followthemoney/types/mimetype.py,sha256=EZ5hIdn-wosfLc-GjXDaOzevxaSXPbSPHDUJmPT1h0I,1355
-followthemoney/types/name.py,sha256=fSAeg_f_y07Ld6jncIFScCg3Jpr-jLXzCMkZfk3AeUc,2189
+followthemoney/types/name.py,sha256=_Vu-MPYbgdN55gNBT2qHh-RDgbLQgT2l_kftnqJIEdw,2240
 followthemoney/types/number.py,sha256=9l5v3hcAoJ4V6jaBS_-Kc1gtdJlQrY9L98ElC5e_PLQ,943
 followthemoney/types/phone.py,sha256=2YFbPBtMepvCWTdcxXq3Fq4AU8B4QYk1FARBpsH8xjs,4040
 followthemoney/types/registry.py,sha256=hvQ1oIWz_4PpyUnKA5azbaZCulNb5LCIPyC-AQYVVyw,1936
@@ -177,10 +177,10 @@ tests/types/test_phones.py,sha256=_GTl-0r5hok8ovUJPRqP7k9kJYMVbanjYUMLrbzFb5U,11
 tests/types/test_registry.py,sha256=IkrHjrEiIIPd4PdMFUg_jVh_gsE6CzGXIF8s3LIbnl0,296
 tests/types/test_topic.py,sha256=m35GSwTy-r77YACGDDac09nYLBIUua42Dy7z292m9EU,707
 tests/types/test_urls.py,sha256=JVmzJ0DKDBle_xLjmOHn0hgDTCpLmljrcfbOM1GSGRw,1170
-followthemoney-3.7.8.dist-info/LICENSE,sha256=Jln3uF70A9AQySyrP9JAW6sQTubLoKVQunvuJqISv7w,1098
-followthemoney-3.7.8.dist-info/METADATA,sha256=wgq_O4fHMbkgeK11PoWXcaXo3-hBvZO2HrJvaEbgkYQ,4453
-followthemoney-3.7.8.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-followthemoney-3.7.8.dist-info/entry_points.txt,sha256=wpgi-5-jyqCy-yw0eYZbnhBuPja_q3RJmiEl7NymXtQ,593
-followthemoney-3.7.8.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-followthemoney-3.7.8.dist-info/top_level.txt,sha256=O33_kGPehy6-69B_k01UgMK55_JOhwqe2de7ND23b-Y,21
-followthemoney-3.7.8.dist-info/RECORD,,
+followthemoney-3.7.10.dist-info/LICENSE,sha256=Jln3uF70A9AQySyrP9JAW6sQTubLoKVQunvuJqISv7w,1098
+followthemoney-3.7.10.dist-info/METADATA,sha256=0SXe0Fgd2MG7xU68DHie1GpL3lfp-AYqODrW9FbhL74,4491
+followthemoney-3.7.10.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+followthemoney-3.7.10.dist-info/entry_points.txt,sha256=ONq-BcCB8Cnk_K1nvWqJPKSRm6sDW0RibLFp0gGtz-k,594
+followthemoney-3.7.10.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+followthemoney-3.7.10.dist-info/top_level.txt,sha256=O33_kGPehy6-69B_k01UgMK55_JOhwqe2de7ND23b-Y,21
+followthemoney-3.7.10.dist-info/RECORD,,

{followthemoney-3.7.8.dist-info → followthemoney-3.7.10.dist-info}/entry_points.txt

@@ -15,3 +15,4 @@ gexf = followthemoney.cli.exports:export_gexf
 mapping = followthemoney.cli.mapping:run_mapping
 rdf = followthemoney.cli.exports:export_rdf
 sieve = followthemoney.cli.sieve:sieve
+