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

followthemoney/dataset/dataset.py

@@ -68,10 +68,8 @@ class Dataset:
     """A container for entities, often from one source or related to one topic.
     A dataset is a set of data, sez W3C."""
 
-    Model = DatasetModel
-
     def __init__(self: Self, data: Dict[str, Any]) -> None:
-        self.model = self.Model.model_validate(data)
+        self.model = DatasetModel.model_validate(data)
         self.name = self.model.name
         self.children: Set[Self] = set()
 

followthemoney/dataset/publisher.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, computed_field
 
 from followthemoney.dataset.util import CountryCode, Url
 from followthemoney.types import registry
@@ -18,6 +18,8 @@ class DataPublisher(BaseModel):
     official: Optional[bool] = False
     logo_url: Optional[Url] = None
 
+    # Re: the type: ignore, see https://github.com/python/mypy/issues/1362 and https://docs.pydantic.dev/2.0/usage/computed_fields/
+    @computed_field # type: ignore[prop-decorator]
     @property
     def country_label(self) -> Optional[str]:
         if self.country is None:

followthemoney/dataset/resource.py

@@ -1,5 +1,5 @@
 from typing import Optional
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, field_validator, computed_field
 
 from followthemoney.dataset.util import Url, DateTimeISO
 from followthemoney.types import registry
@@ -19,10 +19,13 @@ class DataResource(BaseModel):
     @field_validator("mime_type", mode="after")
     @classmethod
     def ensure_mime_type(cls, value: str) -> Optional[str]:
-        if not registry.mimetype.validate(value):
+        cleaned = registry.mimetype.clean_text(value)
+        if cleaned is None:
             raise ValueError(f"Invalid MIME type: {value!r}")
-        return value
+        return cleaned
 
+    # Re: the type: ignore, see https://github.com/python/mypy/issues/1362 and https://docs.pydantic.dev/2.0/usage/computed_fields/
+    @computed_field # type: ignore[prop-decorator]
     @property
     def mime_type_label(self) -> Optional[str]:
         if self.mime_type is None:

followthemoney/entity.py

@@ -44,15 +44,20 @@ class ValueEntity(EntityProxy):
             if stmt_data["prop"] != BASE_ID:
                 self.add(stmt_data["prop"], stmt_data["value"])
 
-    def merge(self: "ValueEntity", other: "ValueEntity") -> "ValueEntity":
+    def merge(self: VE, other: EntityProxy) -> VE:
         merged = super().merge(other)
-        merged._caption = pick_name(_defined(self._caption, other._caption))
-        merged.referents.update(other.referents)
-        merged.datasets.update(other.datasets)
-        self.first_seen = min(_defined(self.first_seen, other.first_seen), default=None)
-        self.last_seen = max(_defined(self.last_seen, other.last_seen), default=None)
-        changed = _defined(self.last_change, other.last_change)
-        self.last_change = max(changed, default=None)
+        if isinstance(other, ValueEntity):
+            merged._caption = pick_name(_defined(self._caption, other._caption))
+            merged.referents.update(other.referents)
+            merged.datasets.update(other.datasets)
+            merged.first_seen = min(
+                _defined(self.first_seen, other.first_seen), default=None
+            )
+            merged.last_seen = max(
+                _defined(self.last_seen, other.last_seen), default=None
+            )
+            changed = _defined(self.last_change, other.last_change)
+            merged.last_change = max(changed, default=None)
         return merged
 
     def to_dict(self) -> Dict[str, Any]:

followthemoney/proxy.py

@@ -421,7 +421,7 @@ class EntityProxy(object):
         """Make a deep copy of the current entity proxy."""
         return self.__class__.from_dict(self.to_dict())
 
-    def merge(self: E, other: E) -> E:
+    def merge(self: E, other: "EntityProxy") -> E:
         """Merge another entity proxy into this one. This will try and find
         the common schema between both entities and then add all property
         values from the other entity into this one."""

{followthemoney-4.0.1.dist-info → followthemoney-4.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: followthemoney
-Version: 4.0.1
+Version: 4.0.3
 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

{followthemoney-4.0.1.dist-info → followthemoney-4.0.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
-followthemoney/__init__.py,sha256=UMJQnsCliiYxAhnQCvqSOCInreUI-bmpiReqDA7ZHhc,856
+followthemoney/__init__.py,sha256=GmOdQXf1GougYiuFmDULXblg9PKnVRmTQkxLPGc1LgI,856
 followthemoney/compare.py,sha256=rtITMzJOXLDOSj7yKPfOxFaknIu6kRpiLDIM22zakpI,5619
-followthemoney/entity.py,sha256=GThAfNNZ4xdtvKTeue3GbtxCaBPngxhZDItpZnNHTtE,2932
+followthemoney/entity.py,sha256=9wLKE3iFapxRQWOs_OAMzK3wtklf2HXaHaMYydIInWE,3045
 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
@@ -10,7 +10,7 @@ followthemoney/names.py,sha256=LODQqExKEHdH4z6Mmbhlm0KeKRzGcptaSWzYXZ7lONI,1120
 followthemoney/namespace.py,sha256=cp7X8aGaZ8HHf7SOfHr2vJHPI2todz2DoyLdiZLNMyg,4472
 followthemoney/ontology.py,sha256=WWY_PYQGl5Ket4zZBuZglzQxD2Bh9UqHok6GJNNX7GA,3001
 followthemoney/property.py,sha256=RDTzTXJeeLFLptQL1_gr1S1T-vdDe-8MGMwsRaGQh0I,7665
-followthemoney/proxy.py,sha256=Pj1GquUD7gdsM1fXb18QnYeT3E9N4ouhwJmPKNKd8ak,19605
+followthemoney/proxy.py,sha256=KhByvSQk1BrZxTinKjjUsbEuD96RveQQ4LRzQIz6pUA,19617
 followthemoney/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 followthemoney/schema.py,sha256=WYnPE4Lego0pJHlojECEv0aO9Miw_YIvEb35HoDo4Zk,18087
 followthemoney/util.py,sha256=DhhcRilSetZpzvCew56AE6zNwenW5a4Y-KtmKM43rjc,4447
@@ -26,9 +26,9 @@ followthemoney/cli/util.py,sha256=C3nGMVY3-9JHSFLn3AGvTNcAdvGcgfFS-7jXIzKg6Ik,47
 followthemoney/dataset/__init__.py,sha256=rOKsI39dccDaYcSa7ASoNKkhmbFYUArxMCRqtrxy2iE,477
 followthemoney/dataset/catalog.py,sha256=bIpxr0jvJeutNSmCaXREQac7TyvZak2Y_QoCFdCM0d4,3001
 followthemoney/dataset/coverage.py,sha256=rBnKs7VngCtIuaDqrF5D0ygCHg8NAMkYbmtl7336PSI,724
-followthemoney/dataset/dataset.py,sha256=0zsynko9-xkbDFMh7xKlgSwytRT6bak1fHjCA6WguA4,4748
-followthemoney/dataset/publisher.py,sha256=eHbguTyDRVRC0ohD6phaLIm5d9Y-eJK6XYIQaelrnN4,694
-followthemoney/dataset/resource.py,sha256=SZpnY6TKNAFZHinaJNrEpT7YgdrCSMhYDT_UNn9Fmko,931
+followthemoney/dataset/dataset.py,sha256=wWUzWsdzDW9qXLy8lS6Bpy08WMcaNU30oiMXU8jfo14,4724
+followthemoney/dataset/publisher.py,sha256=nexZe9XexV8WI5Id999vf5OH_DPUmiKQ_GT3c59eF44,893
+followthemoney/dataset/resource.py,sha256=S_-tNjMwHQ8LcSOsZO_xhXD-vLK90wyxtIRBbyCJ0Xo,1164
 followthemoney/dataset/util.py,sha256=ajUIBRF64dizdgy9LAp2abvFXRFOWCqQX9sDbToWFYo,1607
 followthemoney/export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 followthemoney/export/common.py,sha256=5b-Qlu3MaA0kSzzMAP93FAWncpgiioENnCnHikWYxhs,1021
@@ -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.0.1.dist-info/METADATA,sha256=Ctiv_lnTOczS2bc4C0UJzlqwS0BoiQQYym0GxtwOxlY,6791
-followthemoney-4.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-followthemoney-4.0.1.dist-info/entry_points.txt,sha256=caoFTlf213jhg5sz3TNSofutjUTzaKtWATuSIdd9Cps,653
-followthemoney-4.0.1.dist-info/licenses/LICENSE,sha256=H6_EVXisnJC0-18CjXIaqrBSFq_VH3OnS7u3dccOv6g,1148
-followthemoney-4.0.1.dist-info/RECORD,,
+followthemoney-4.0.3.dist-info/METADATA,sha256=yUOxdiPQceDy0QyIYrvGxXJq4CYCplr-fSFipACeg1s,6791
+followthemoney-4.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+followthemoney-4.0.3.dist-info/entry_points.txt,sha256=caoFTlf213jhg5sz3TNSofutjUTzaKtWATuSIdd9Cps,653
+followthemoney-4.0.3.dist-info/licenses/LICENSE,sha256=H6_EVXisnJC0-18CjXIaqrBSFq_VH3OnS7u3dccOv6g,1148
+followthemoney-4.0.3.dist-info/RECORD,,