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

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-4.1.1.dist-info → followthemoney-4.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: followthemoney
-Version: 4.1.1
+Version: 4.1.2
 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.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-followthemoney/__init__.py,sha256=_drb_fsELoJ6qpcyjNSJbn8OVaBH-ZdeDQKaFJ1S_Qk,856
+followthemoney/__init__.py,sha256=1G8YlnRJL9_8pMYDUPl29Njf33pRdmat6kmg2elXBbs,856
 followthemoney/compare.py,sha256=bZlnj2VMoe67q4Lyq_VwS1a-EJnEK1kC8prbs8jyL9E,5774
 followthemoney/entity.py,sha256=hHY9yysn_iFTtXqcHg4hHhYfmgLw4prWul8rD1X82Y0,3184
 followthemoney/exc.py,sha256=GyMgwY4QVm87hLevDfV7gM1MJsDqfNCi_UQw7F_A8X8,858
@@ -113,7 +113,7 @@ followthemoney/schema/Vessel.yaml,sha256=nFaUJ_0BzFJstvog1iDvwV9DHKHr9ky4DLb1NZG
 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 +144,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
@@ -160,8 +160,8 @@ followthemoney/types/phone.py,sha256=r8uRqWinS0CYnYBTs405k5gO4jeatUDgjdzzijoMKJE
 followthemoney/types/string.py,sha256=fqyTauAm4mNnNaoH-yH087RBbNh-G5ZZUO3awTGQUUg,1230
 followthemoney/types/topic.py,sha256=CS5IoI8gm4MSVxfV6K4mGd20_tT1SaKMkcOt_ObSsAg,3678
 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.1.2.dist-info/METADATA,sha256=Hy34w4IjkrPyJ2O0nPRhUcamZ3oiN7h_kbGYdyIUnnI,6748
+followthemoney-4.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+followthemoney-4.1.2.dist-info/entry_points.txt,sha256=caoFTlf213jhg5sz3TNSofutjUTzaKtWATuSIdd9Cps,653
+followthemoney-4.1.2.dist-info/licenses/LICENSE,sha256=H6_EVXisnJC0-18CjXIaqrBSFq_VH3OnS7u3dccOv6g,1148
+followthemoney-4.1.2.dist-info/RECORD,,