followthemoney 3.8.1__py3-none-any.whl → 3.8.3__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.8.1"
+__version__ = "3.8.3"
 
 
 model_path = os.path.dirname(__file__)

followthemoney/export/neo4j.py

@@ -2,13 +2,12 @@ import os
 import json
 import logging
 from typing import Any, Dict, Iterable, List, Optional, Set, TextIO
-import stringcase  # type: ignore
 
 from followthemoney.export.csv import CSVMixin, CSVWriter
 from followthemoney.export.graph import GraphExporter, DEFAULT_EDGE_TYPES
 from followthemoney.graph import Edge, Node
 from followthemoney.schema import Schema
-from followthemoney.util import PathLike
+from followthemoney.util import PathLike, const_case
 
 log = logging.getLogger(__name__)
 NEO4J_ADMIN_PATH = os.environ.get("NEO4J_ADMIN_PATH", "neo4j-admin")
@@ -72,12 +71,12 @@ class Neo4JCSVExporter(CSVMixin, GraphExporter):
 
     def write_edge(self, edge: Edge, extra: List[str]) -> None:
         if edge.prop is not None:
-            type_ = stringcase.constcase(edge.prop.name)
+            type_ = const_case(edge.prop.name)
             row = [type_, edge.source_id, edge.target_id, edge.weight]
             self.links_writer.writerow(row)
         if edge.proxy is not None:
             proxy = edge.proxy
-            type_ = stringcase.constcase(proxy.schema.name)
+            type_ = const_case(proxy.schema.name)
             # That potentially may lead to multiple edges with same id
             cells = [proxy.id, type_, edge.source_id, edge.target_id]
             cells.extend(extra or [])
@@ -174,7 +173,7 @@ class CypherGraphExporter(GraphExporter):
                 % {
                     "source": self._to_map({"id": edge.source_id}),
                     "target": self._to_map({"id": edge.target_id}),
-                    "type": stringcase.constcase(edge.type_name),
+                    "type": const_case(edge.type_name),
                     "map": self._to_map(attributes),
                 }
             )

followthemoney/schema/Occupancy.yaml

@@ -20,6 +20,13 @@ Occupancy:
     caption:
       - startDate
       - endDate
+  temporalExtent:
+    start:
+      - startDate
+      - declarationDate
+      - date
+    end:
+      - endDate
   properties:
     holder:
       label: "Holder"

followthemoney/schema/Thing.yaml

@@ -76,6 +76,15 @@ Thing:
       range: Address
     program: # Used by sanctions
       label: Program
+      description: Regulatory program or sanctions list on which an entity is listed.
+    programId:
+      # This is a unique identifier for the program issued by OpenSanctions, but
+      # could also be used for authority-issued IDs in other usage scenarios.
+      label: "Program ID"
+      type: identifier
+      maxLength: 64
+      hidden: true
+      matchable: false
     notes:
       label: Notes
       type: text

followthemoney/types/country.py

@@ -45,9 +45,9 @@ class CountryType(EnumType):
                 return ftm_country
         code = countrynames.to_code(text, fuzzy=fuzzy)
         if code is not None:
-            lower = code.lower()
-            if lower in self.codes:
-                return lower
+            territory = get_territory(code)
+            if territory is not None:
+                return territory.ftm_country
         return None
 
     def country_hint(self, value: str) -> str:

followthemoney/types/language.py

@@ -89,6 +89,7 @@ class LanguageType(EnumType):
         "mya",
         "khm",
         "cnr",
+        "ben",
     ]
     LANGUAGES = get_env_list("FTM_LANGUAGES", LANGUAGES)
     LANGUAGES = [lang.lower().strip() for lang in LANGUAGES]

followthemoney/types/topic.py

@@ -36,6 +36,7 @@ class TopicType(EnumType):
         "crime.traffick": _("Trafficking"),
         "crime.traffick.drug": _("Drug trafficking"),
         "crime.traffick.human": _("Human trafficking"),
+        "risk.forced.labor": _("Forced labor"),
         "wanted": _("Wanted"),
         "corp.offshore": _("Offshore"),
         "corp.shell": _("Shell company"),

followthemoney/util.py

@@ -105,6 +105,11 @@ def join_text(*parts: Any, sep: str = " ") -> Optional[str]:
     return sep.join(texts)
 
 
+def const_case(text: str) -> str:
+    """Convert the given text to a constant case."""
+    return text.upper().replace(" ", "_")
+
+
 def get_entity_id(obj: Any) -> Optional[str]:
     """Given an entity-ish object, try to get the ID."""
     if is_mapping(obj):

{followthemoney-3.8.1.dist-info → followthemoney-3.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: followthemoney
-Version: 3.8.1
+Version: 3.8.3
 Summary: A data model for anti corruption data modeling and analysis.
 Project-URL: Documentation, https://followthemoney.tech/
 Project-URL: Repository, https://github.com/alephdata/followthemoney.git
@@ -44,17 +44,15 @@ Requires-Dist: networkx<3.5,>=2.5
 Requires-Dist: normality<3.0.0,>=2.4.0
 Requires-Dist: openpyxl<4.0.0,>=3.0.5
 Requires-Dist: orjson<4.0,>=3.7
-Requires-Dist: phonenumbers<9.0.0,>=8.12.22
+Requires-Dist: phonenumbers<10.0.0,>=8.12.22
 Requires-Dist: prefixdate<1.0.0,>=0.4.0
-Requires-Dist: python-stdnum<2.0.0,>=1.16
 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<1.0.0,>=0.9.3
+Requires-Dist: rigour<1.0.0,>=0.11.1
 Requires-Dist: sqlalchemy2-stubs
 Requires-Dist: sqlalchemy<3.0.0,>=1.4.49
-Requires-Dist: stringcase<2.0.0,>=1.2.0
 Requires-Dist: types-pyyaml
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'

{followthemoney-3.8.1.dist-info → followthemoney-3.8.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-followthemoney/__init__.py,sha256=Cuo89JNtffF2ZZmMgYEsvlkWKVYHXnFnFvzQ6BRX6Gw,360
+followthemoney/__init__.py,sha256=sJRsdK9ZBunDj47hDo_vq_7drj1cdN16hnj9lXMMIsQ,360
 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
@@ -13,7 +13,7 @@ followthemoney/proxy.py,sha256=M7RIPF0k-P3v7GYKYhRVVaO1cnUf5FArJepE-2c0KMQ,20033
 followthemoney/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 followthemoney/rdf.py,sha256=9wPs-tqN9QILuvrmH_YheNaFQctyIQqoIEqcS465QHs,343
 followthemoney/schema.py,sha256=vPG2C4r0ar3F74fbU_v-YPq4I3Qfmu9gzxMFWksU7I4,18097
-followthemoney/util.py,sha256=dMaCas9EjUPQ9q_a4qtV1pQOxWfxPjyjwR0e84XSN9c,4396
+followthemoney/util.py,sha256=6VR-T5-vT-8xpE6__Skrqe_MpE6y6csvNKERTJlsITA,4527
 followthemoney/cli/__init__.py,sha256=Fl05wMr5-FlOSMRpmu1HJSNfPRpy8u9as5IRbGXdo4U,421
 followthemoney/cli/aggregate.py,sha256=Gwfi5Bt1LCwqbpsCu4P1Cr-QJtCWhbaqgGEzfwJUUL4,2142
 followthemoney/cli/cli.py,sha256=yrPw2iyKY-E-uRWe6KN9W3ayvz-22vfpe_ZeD0RiI0c,3591
@@ -26,7 +26,7 @@ followthemoney/export/common.py,sha256=_YrXrwsqmyboDZDhtJ_PazUUJYe1Y-Trqc9lz4YlV
 followthemoney/export/csv.py,sha256=AvWgyWg0nICAVLv4k9QgWRlgJhJonKCjzlZkrahe5Tg,2633
 followthemoney/export/excel.py,sha256=pj6zNpIbye_Zm3vhCamcqHEe9Fw-RyjtWQDCFY6608s,2645
 followthemoney/export/graph.py,sha256=v0z1FgadyFk5aQ0A5q8E9R4fSO-Tpi5JU9YTDwnRKD8,2765
-followthemoney/export/neo4j.py,sha256=JCLb1eW5FFIJXqmnpNMRzRs1KYuYkCtHZp7KJcu-JNY,7104
+followthemoney/export/neo4j.py,sha256=aw1vBOLTRinFbOhn19WThLlQ6NWVbm2gop5Jz_ihc58,7052
 followthemoney/export/rdf.py,sha256=E6RiW7oIsJdaBaLAVm6o-MTokARZtqONPuayILqTqo0,786
 followthemoney/mapping/__init__.py,sha256=iwNqzzvrzJNbNDlOCaDLlBTUrNTlnYHIB5cvo_-9oN4,82
 followthemoney/mapping/csv.py,sha256=Tvc6VSh7-ca63LEE4G0yqOCeGMETkuKzUjIkVn4_d7Q,3185
@@ -73,7 +73,7 @@ followthemoney/schema/Membership.yaml,sha256=IPmaOX4Ai2r4sGcA5ig2WmLvWHb38akdxp4
 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=hFXUAmPxxy3hNEe92pGKgMp80a9A-v_fNDIZd98NzcY,866
+followthemoney/schema/Occupancy.yaml,sha256=WojlqzuWao84MJxRE9K6a-1D-Jtu78-0h6laODhdKw8,975
 followthemoney/schema/Organization.yaml,sha256=wPXU1ni0-3QzvttDq-gIjbAYHzcWoo3nsLGLw6cnHKI,1064
 followthemoney/schema/Ownership.yaml,sha256=tLWESE9VX0aUuhe6C1pToq2-auPVZBdE3xvBmTRfmPc,1057
 followthemoney/schema/Package.yaml,sha256=gPr-P3lcg7OOAav_KVa8baK4yK57JwfcXwxXheD96UQ,310
@@ -96,7 +96,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=PeseDMTO8rDzoTrxRjL9efyJQ0_lGgRQRTzwLu5OwiU,2458
+followthemoney/schema/Thing.yaml,sha256=IWVpyhUGuvR6x5eyObPjJ0eEIyYHuw1FLWGLe6aaNas,2829
 followthemoney/schema/Trip.yaml,sha256=nLQD_ApmVJ8D56Czl7K700hhNZjzFV9FOQ3NBSQDLiM,771
 followthemoney/schema/UnknownLink.yaml,sha256=lneS_HZNgeLyJxwzWnLx0ZoyY3MXt99I_K2X_o9z5g8,682
 followthemoney/schema/UserAccount.yaml,sha256=V1JWwwcggCO4G9ByJY9zlQ0uOVp8HQK2mRXwqaGJnBM,763
@@ -132,7 +132,7 @@ followthemoney/types/__init__.py,sha256=X9XeM6JktzirAw5gGkyDKGM70NuiJ9Tbjoq0IwVc
 followthemoney/types/address.py,sha256=NnJli6jIs5DfePL4m3dA3Xwv7GA8sdl1J6Mtm-QLeOY,2068
 followthemoney/types/checksum.py,sha256=OqjCsBPyMIV3_Y20kTTvjkyayy32pBtaI5KKwYQb6lY,937
 followthemoney/types/common.py,sha256=Yk-7LZ6uDgFzKXUZxQ_j5miN2ZMnlBOziU0iFC7FE9I,10202
-followthemoney/types/country.py,sha256=1ORYH_wV1cbT7HQzoKi3EbKVAy4G59nsuGk4m6Rm3-M,1834
+followthemoney/types/country.py,sha256=aYSvTeI37JFzV3ATl-_-r6Vnc4ye8Nc0rVwaXgqbOaU,1863
 followthemoney/types/date.py,sha256=4lZCd0aws-T3HE2BYkb-a-t8iQDr0nqFSAEBoUKiTlM,2683
 followthemoney/types/email.py,sha256=zAnMHwC_FZh7IagpDRhGZf-GfQR6uW8d-lZP4UCdGcM,2745
 followthemoney/types/entity.py,sha256=FA8xXNCkiM7HlF6k5lxTlb_B_LKlUwaoOMaVqAdjgYc,2477
@@ -141,17 +141,17 @@ 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=CaNKofIzgH8M0yC7YcDt3o2faVCm-NL9xsaC9ypnTyc,2849
+followthemoney/types/language.py,sha256=9w4jgJN4vs5SKPyBIXLcSUo0nupH4F2LukiF4KbPxxY,2864
 followthemoney/types/mimetype.py,sha256=EZ5hIdn-wosfLc-GjXDaOzevxaSXPbSPHDUJmPT1h0I,1355
 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
 followthemoney/types/string.py,sha256=grDn1OgKWxIzVxGEdp0HjVKIqtQ9W4SW2ty4quv3Pcs,1202
-followthemoney/types/topic.py,sha256=6g57JKTFF_I233-afvuaswFxMaN_Kmg5MZ4_iAKZh9c,3754
+followthemoney/types/topic.py,sha256=yOPvLdGGXKfDhQhKeIQ-5nxrqKJd8ef7EC2GCBry1Vk,3802
 followthemoney/types/url.py,sha256=r7Pd6Yfn--amwMi_nHoTLMwm5SH8h50SMgQaa2G4PJ0,1492
-followthemoney-3.8.1.dist-info/METADATA,sha256=7gIc__XwnT9cUwDDaG2AQT3zT51gbYTHm1XEd71V6QY,6145
-followthemoney-3.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-followthemoney-3.8.1.dist-info/entry_points.txt,sha256=xvTXjAz0CiZplq4V3iQXlmBexaJyW3zNucIvcDP6L_c,593
-followthemoney-3.8.1.dist-info/licenses/LICENSE,sha256=3tfmmk9RtT1eh67a-NDRwcmOLzztbCtqlHW6O1U92ZA,1098
-followthemoney-3.8.1.dist-info/RECORD,,
+followthemoney-3.8.3.dist-info/METADATA,sha256=Z-vsTWjM4sHAPcy-nPzMw-pTQ57c7eh4BxlTDIRq25I,6065
+followthemoney-3.8.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+followthemoney-3.8.3.dist-info/entry_points.txt,sha256=xvTXjAz0CiZplq4V3iQXlmBexaJyW3zNucIvcDP6L_c,593
+followthemoney-3.8.3.dist-info/licenses/LICENSE,sha256=3tfmmk9RtT1eh67a-NDRwcmOLzztbCtqlHW6O1U92ZA,1098
+followthemoney-3.8.3.dist-info/RECORD,,